projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[linux-2.6-microblaze.git]
/
fs
/
ext4
/
ioctl.c
diff --git
a/fs/ext4/ioctl.c
b/fs/ext4/ioctl.c
index
20aeff8
..
606dee9
100644
(file)
--- a/
fs/ext4/ioctl.c
+++ b/
fs/ext4/ioctl.c
@@
-148,7
+148,7
@@
static long swap_inode_boot_loader(struct super_block *sb,
goto journal_err_out;
}
goto journal_err_out;
}
-
down_write(&EXT4_I(inode)->i_mmap_sem
);
+
filemap_invalidate_lock(inode->i_mapping
);
err = filemap_write_and_wait(inode->i_mapping);
if (err)
goto err_out;
err = filemap_write_and_wait(inode->i_mapping);
if (err)
goto err_out;
@@
-256,7
+256,7
@@
err_out1:
ext4_double_up_write_data_sem(inode, inode_bl);
err_out:
ext4_double_up_write_data_sem(inode, inode_bl);
err_out:
-
up_write(&EXT4_I(inode)->i_mmap_sem
);
+
filemap_invalidate_unlock(inode->i_mapping
);
journal_err_out:
unlock_two_nondirectories(inode, inode_bl);
iput(inode_bl);
journal_err_out:
unlock_two_nondirectories(inode, inode_bl);
iput(inode_bl);