Message ID | a9c490ad00b6a441ec991306b22c2fd9d6565de3.1744181682.git.nirjhar.roy.lists@gmail.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | Minor cleanups in common/ | expand |
On Wed, Apr 09, 2025 at 07:00:49AM +0000, Nirjhar Roy (IBM) wrote: > 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> > --- > check | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/check b/check > index 32890470..3d621210 100755 > --- 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. Thanks for adding this comment! Future me will probably appreciate this breadcrumb. :) Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> --D > _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 > -- > 2.34.1 > >
diff --git a/check b/check index 32890470..3d621210 100755 --- 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