]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
xfs: fix remount rw with unrecognized options
authorChristoph Hellwig <hch@lst.de>
Sun, 12 Oct 2008 12:30:44 +0000 (14:30 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Oct 2008 17:00:00 +0000 (10:00 -0700)
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>
fs/xfs/linux-2.6/xfs_super.c

index 7227b2efef22ec5c0417b08a7464456c06647400..e39013619b2619317a77cb8e1ceb3aee05de033f 100644 (file)
@@ -1323,7 +1323,7 @@ xfs_fs_remount(
        "XFS: mount option \"%s\" not supported for remount\n", p);
                        return -EINVAL;
 #else
-                       return 0;
+                       break;
 #endif
                }
        }