| Message ID | 20190724155656.GH7084@magnolia (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | fstests: various fixes | expand |
On Wed, Jul 24, 2019 at 08:56:56AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Unmount the V4 filesystem we forcibly created to run this test during > test cleanup so that the post-test wrapup checks won't try to remount > the filesystem with different MOUNT_OPTIONS (specifically, the ones > that get screened out by _force_xfsv4_mount_options) and fail. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > tests/xfs/194 | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/xfs/194 b/tests/xfs/194 > index 3e186528..1f46d403 100755 > --- a/tests/xfs/194 > +++ b/tests/xfs/194 > @@ -18,6 +18,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > _cleanup() > { > cd / > + _scratch_unmount Comment as to why this is necessary here so we don't go and remove it because unmounting in cleanup should generally be unnecessary.... -Dave.
On Thu, Jul 25, 2019 at 09:22:59AM +1000, Dave Chinner wrote: > On Wed, Jul 24, 2019 at 08:56:56AM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <darrick.wong@oracle.com> > > > > Unmount the V4 filesystem we forcibly created to run this test during > > test cleanup so that the post-test wrapup checks won't try to remount > > the filesystem with different MOUNT_OPTIONS (specifically, the ones > > that get screened out by _force_xfsv4_mount_options) and fail. > > > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > > --- > > tests/xfs/194 | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/tests/xfs/194 b/tests/xfs/194 > > index 3e186528..1f46d403 100755 > > --- a/tests/xfs/194 > > +++ b/tests/xfs/194 > > @@ -18,6 +18,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > > _cleanup() > > { > > cd / > > + _scratch_unmount > > Comment as to why this is necessary here so we don't go and remove > it because unmounting in cleanup should generally be unnecessary.... Ok. --D > -Dave. > -- > Dave Chinner > david@fromorbit.com
diff --git a/tests/xfs/194 b/tests/xfs/194 index 3e186528..1f46d403 100755 --- a/tests/xfs/194 +++ b/tests/xfs/194 @@ -18,6 +18,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _cleanup() { cd / + _scratch_unmount rm -f $tmp.* }