From cf02f80a95569db6b6aaffb47b0c38d5b4f64c5e Mon Sep 17 00:00:00 2001 From: Pavel Shilovsky Date: Mon, 8 Sep 2014 22:26:52 +1000 Subject: [PATCH] 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 Reviewed-by: Steve French Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- common/rc | 6 ++++++ tests/generic/013 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 40356988..2aa4eb43 100644 --- 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 } +_test_remount() +{ + $UMOUNT_PROG $TEST_DEV + _test_mount +} + _scratch_mkfs_options() { _scratch_options mkfs diff --git a/tests/generic/013 b/tests/generic/013 index 93d99047..534c9f07 100755 --- a/tests/generic/013 +++ b/tests/generic/013 @@ -35,7 +35,7 @@ _cleanup() { 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 -- 2.39.5