]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
check: Remove redundant _test_mount in check
authorNirjhar Roy (IBM) <nirjhar.roy.lists@gmail.com>
Wed, 9 Apr 2025 07:00:49 +0000 (07:00 +0000)
committerZorro Lang <zlang@kernel.org>
Thu, 10 Apr 2025 18:35:26 +0000 (02:35 +0800)
init_rc already does a _test_mount. Hence removing the additional
_test_mount call when OLD_TEST_FS_MOUNT_OPTS != TEST_FS_MOUNT_OPTS.

Signed-off-by: Nirjhar Roy (IBM) <nirjhar.roy.lists@gmail.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
check

diff --git a/check b/check
index 32890470a020266d21e92dc83c24a68046855407..3d621210d86a0f32473ceba499b876bf6676f6e1 100755 (executable)
--- a/check
+++ b/check
@@ -791,13 +791,9 @@ function run_section()
                . common/rc
                _prepare_test_list
        elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then
+               # Unmount TEST_DEV to apply the updated mount options.
+               # It will be mounted again by init_rc(), called shortly after.
                _test_unmount 2> /dev/null
-               if ! _test_mount
-               then
-                       echo "check: failed to mount $TEST_DEV on $TEST_DIR"
-                       status=1
-                       exit
-               fi
        fi
 
        init_rc