From 7e61d255a5ffa5389e44d9bf7da5f504e9f2f5c0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 24 Oct 2010 09:45:22 -0400 Subject: [PATCH] --- yaml --- r: 217788 b: refs/heads/master c: 8e3b9a072d071700e83e88b0bf59115c59042885 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext2/super.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e94f289fc284..7681ffbebb50 100644 --- 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 index 85df87d0f7b7..0901320671da 100644 --- 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;