From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2130.oracle.com ([156.151.31.86]:43456 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725842AbfGYSER (ORCPT ); Thu, 25 Jul 2019 14:04:17 -0400 Date: Thu, 25 Jul 2019 11:04:13 -0700 From: "Darrick J. Wong" Subject: [PATCH v2 7/3] xfs/194: unmount forced v4 fs during cleanup Message-ID: <20190725180413.GJ1561054@magnolia> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> <20190724155656.GH7084@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190724155656.GH7084@magnolia> Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org From: Darrick J. Wong 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 --- v2: add a comment explaining why we unmount the scratch device --- tests/xfs/194 | 5 +++++ 1 file changed, 5 insertions(+) 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.* }