On Wed, Feb 05, 2025 at 11:42:56AM +1100, Dave Chinner wrote:
> On Tue, Feb 04, 2025 at 01:27:31PM -0800, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@xxxxxxxxxx>
> >
> > Make the _try_scratch_mount and _test_mount helpers return the exit code
> > from mount, not _prepare_for_eio_shutdown.
> >
> > Cc: <fstests@xxxxxxxxxxxxxxx> # v2024.12.08
> > Fixes: 1a49022fab9b4d ("fstests: always use fail-at-unmount semantics for XFS")
> > Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
>
> 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.
Will change.
> Regardless, it gives the same result, so:
>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
Thanks!
--D
> --
> Dave Chinner
> david@xxxxxxxxxxxxx
>
