From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Thu, 25 Jul 2019 18:04:13 +0000 (-0700)
Subject: xfs/194: unmount forced v4 fs during cleanup
X-Git-Tag: v2022.05.01~1076
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ea7ab13c6190fe8b3e32ac735b5a9a682e936196;p=xfstests-dev.git

xfs/194: unmount forced v4 fs during cleanup

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>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/tests/xfs/194 b/tests/xfs/194
index 3e186528..9001a146 100755
--- a/tests/xfs/194
+++ b/tests/xfs/194
@@ -18,6 +18,11 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _cleanup()
 {
     cd /
+    # Unmount the V4 filesystem we forcibly created to run this test 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.
+    _scratch_unmount
     rm -f $tmp.*
 }