generic/013: encapsulate remount during cleanup

The existing code calls remount for $TEST_DEV with constantly defined
mount options. This can fail if a user specifies different mount options.
Fix this by using new _test_remount() call that remounts $TEST_DEV.

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Reviewed-by: Steve French <smfrench@gmail.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/rc b/common/rc
index 40356988ad873b0e596055de1df285dd2a76fa36..2aa4eb4366189809d7b820348d773cdca5166e67 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -218,6 +218,12 @@ _test_mount()
     _mount -t $FSTYP $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
 }
 
     _mount -t $FSTYP $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
 }
 

+_test_remount()
+{
+    $UMOUNT_PROG $TEST_DEV
+    _test_mount
+}
+

 _scratch_mkfs_options()
 {
     _scratch_options mkfs
 _scratch_mkfs_options()
 {
     _scratch_options mkfs

diff --git a/tests/generic/013 b/tests/generic/013
index 93d99047e4afa910b35395916fa01e64df52d4f3..534c9f07ba1792ec3cfcef15c2b433ae206a11a0 100755 (executable)
--- a/tests/generic/013
+++ b/tests/generic/013
@@ -35,7 +35,7 @@ _cleanup()
 {
     cd /
     # we might get here with a RO FS
 {
     cd /
     # we might get here with a RO FS

-    mount -o remount,rw $TEST_DEV >/dev/null 2>&1
+    _test_remount

     # now remove fsstress directory.
     # N.B. rm(1) on IRIX can find problems when building up a long pathname
     # such that what it has is greater the 1024 chars and will
     # now remove fsstress directory.
     # N.B. rm(1) on IRIX can find problems when building up a long pathname
     # such that what it has is greater the 1024 chars and will