summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2008-10-12 14:30:44 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-15 19:00:00 +0200
commit6c5e51dae2c37127e00be392f40842e08077e96a (patch)
treeee2d925339271f53b321d53c885e738fccffd75b
parentMerge branch 'build_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/mfa... (diff)
downloadlinux-6c5e51dae2c37127e00be392f40842e08077e96a.tar.xz
linux-6c5e51dae2c37127e00be392f40842e08077e96a.zip
xfs: fix remount rw with unrecognized options
When we skip unrecognized options in xfs_fs_remount we should just break out of the switch and not return because otherwise we may skip clearing the xfs-internal read-only flag. This will only show up on some operations like touch because most read-only checks are done by the VFS which thinks this filesystem is r/w. Eventually we should replace the XFS read-only flag with a helper that always checks the VFS flag to make sure they can never get out of sync. Bug reported and fix verified by Marcel Beister on #xfs. Bug fix verified by updated xfstests/189. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: Timothy Shimmin <tes@sgi.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 7227b2efef22..e39013619b26 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1323,7 +1323,7 @@ xfs_fs_remount(
"XFS: mount option \"%s\" not supported for remount\n", p);
return -EINVAL;
#else
- return 0;
+ break;
#endif
}
}