| Message ID | 173870406411.546134.11968180503485222405.stgit@frogsfrogsfrogs (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [01/34] generic/476: fix fsstress process management | expand |
On Tue, Feb 04, 2025 at 01:27:31PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Make the _try_scratch_mount and _test_mount helpers return the exit code > from mount, not _prepare_for_eio_shutdown. > > Cc: <fstests@vger.kernel.org> # v2024.12.08 > Fixes: 1a49022fab9b4d ("fstests: always use fail-at-unmount semantics for XFS") > Signed-off-by: "Darrick J. Wong" <djwong@kernel.org> Ack, missed that. Though: > --- > common/rc | 2 ++ > 1 file changed, 2 insertions(+) > > > diff --git a/common/rc b/common/rc > index 03603a5198e3b6..56b4e7e018a8e0 100644 > --- a/common/rc > +++ b/common/rc > @@ -440,6 +440,7 @@ _try_scratch_mount() > [ $mount_ret -ne 0 ] && return $mount_ret > _idmapped_mount $SCRATCH_DEV $SCRATCH_MNT > _prepare_for_eio_shutdown $SCRATCH_DEV > + return $mount_ret These could just be 'return 0' because we've already checked for $mount_ret being non-zero. Regardless, it gives the same result, so: Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff --git a/common/rc b/common/rc index 03603a5198e3b6..56b4e7e018a8e0 100644 --- a/common/rc +++ b/common/rc @@ -440,6 +440,7 @@ _try_scratch_mount() [ $mount_ret -ne 0 ] && return $mount_ret _idmapped_mount $SCRATCH_DEV $SCRATCH_MNT _prepare_for_eio_shutdown $SCRATCH_DEV + return $mount_ret } # mount scratch device with given options and _fail if mount fails @@ -657,6 +658,7 @@ _test_mount() [ $mount_ret -ne 0 ] && return $mount_ret _idmapped_mount $TEST_DEV $TEST_DIR _prepare_for_eio_shutdown $TEST_DEV + return $mount_ret } _test_unmount()