test 199: test features2 fixup for the regular case, too

Eric Sandeen noted that we should not only test the mount ro first, then
remount rw case in 199 but also the regular mount rw case.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Felix Blyakher <felixb@sgi.com>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/199 b/199
index 099cc1ce499193b3186458d0dbc7d487783773cf..8f0b37a24f77db6785782dc2dac2337ed321c921 100644 (file)
--- a/199
+++ b/199
@@ -1,8 +1,10 @@
 #! /bin/sh
 # FS QA Test No. 199
 #
-# Check that a filesystem first mounted read-only and then remounted
-# performs the features2 fixup properly.
+# Check that the features2 location fixups work correctly.  We check both
+# a regular read-write mount of a filesystem and the case where the
+# filesystem is first mounted read-only and then later remounted read-write,
+# which is the usual case for the root filesystem.
 #
 #-----------------------------------------------------------------------
 # Copyright (c) 2008 Christoph Hellwig.
@@ -51,8 +53,20 @@ xfs_db -x $SCRATCH_DEV -c 'sb' -c 'print bad_features2'
 echo "Clearing features2:"
 xfs_db -x $SCRATCH_DEV -c 'sb' -c 'write features2 0'
 
+_scratch_mount
+umount $SCRATCH_MNT
+echo "Features 2 after mount rw:"
+xfs_db -x $SCRATCH_DEV -c 'sb' -c 'print features2'
+
+#
+# Clear the normal flags again for the second rount.
+#
+echo "Clearing features2:"
+xfs_db -x $SCRATCH_DEV -c 'sb' -c 'write features2 0'
+
 #
 # And print the flags after a mount ro and remount rw
+#
 _scratch_mount -o ro
 _scratch_mount -o remount,rw
 umount $SCRATCH_MNT

diff --git a/199.out b/199.out
index 04b513c9f6cade3c55a892162714659e85816a5d..45eaa818e1e3e8ca5573bfc2a69a0123b646c61b 100644 (file)
--- a/199.out
+++ b/199.out
@@ -4,6 +4,10 @@ features2 = 0x8
 bad_features2 = 0x8
 Clearing features2:
 features2 = 0
+Features 2 after mount rw:
+features2 = 0x8
+Clearing features2:
+features2 = 0
 Features 2 after mount ro and remount rw:
 features2 = 0x8
 *** done