---

yaml --- r: 217788 b: refs/heads/master c: 8e3b9a0 h: refs/heads/master v: v3
git-mirror · Oct 26, 2010 · 7e61d25 · 7e61d25
1 parent 7a3b32a
commit 7e61d25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 309f77ad9bea057d55b04580b5a711e9e3727e83
+refs/heads/master: 8e3b9a072d071700e83e88b0bf59115c59042885
diff --git a/trunk/fs/ext2/super.c b/trunk/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;