diff options
| author | Al Viro | 2010-10-24 15:45:22 +0200 |
|---|---|---|
| committer | Al Viro | 2010-10-26 03:23:00 +0200 |
| commit | 8e3b9a072d071700e83e88b0bf59115c59042885 (patch) | |
| tree | 504d77766446dcb5937f1e50cb0560da42872e5a /fs | |
| parent | fs/buffer.c: call __block_write_begin() if we have page (diff) | |
| download | kernel-qcow2-linux-8e3b9a072d071700e83e88b0bf59115c59042885.tar.gz kernel-qcow2-linux-8e3b9a072d071700e83e88b0bf59115c59042885.tar.xz kernel-qcow2-linux-8e3b9a072d071700e83e88b0bf59115c59042885.zip | |
ext2_remount: don't bother with invalidate_inodes()
It's pointless - we *do* have busy inodes (root directory,
for one), so that call will fail and attempt to change
XIP flag will be ignored.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext2/super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 85df87d0f7b7..0901320671da 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1221,9 +1221,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) } es = sbi->s_es; - if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) != - (old_mount_opt & EXT2_MOUNT_XIP)) && - invalidate_inodes(sb)) { + if ((sbi->s_mount_opt ^ old_mount_opt) & EXT2_MOUNT_XIP) { ext2_msg(sb, KERN_WARNING, "warning: refusing change of " "xip flag with busy inodes while remounting"); sbi->s_mount_opt &= ~EXT2_MOUNT_XIP; |