From patchwork Tue May 29 16:55:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 10436461 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB48460535 for ; Tue, 29 May 2018 16:56:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A99828A1B for ; Tue, 29 May 2018 16:56:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D27A28A0C; Tue, 29 May 2018 16:56:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B68328A1B for ; Tue, 29 May 2018 16:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936974AbeE2Q4P (ORCPT ); Tue, 29 May 2018 12:56:15 -0400 Received: from mx2.suse.de ([195.135.220.15]:39105 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936976AbeE2Q4G (ORCPT ); Tue, 29 May 2018 12:56:06 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 48D28AD45 for ; Tue, 29 May 2018 16:56:05 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 1C41B1E0D64; Tue, 29 May 2018 18:56:05 +0200 (CEST) From: Jan Kara To: Cc: Jan Kara Subject: [PATCH 3/6] xfs/310: Cleanup Date: Tue, 29 May 2018 18:55:58 +0200 Message-Id: <20180529165601.32133-4-jack@suse.cz> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180529165601.32133-1-jack@suse.cz> References: <20180529165601.32133-1-jack@suse.cz> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cleanup couple of things that were objected to when creating test ext4/033 out of this one. Use _require_scratch_nocheck instead of recreating scratch fs before exiting. Avoid needless cleanup of dmhugedev on exit - _cleanup takes care of that. Use _scratch_unmount where possible. Signed-off-by: Jan Kara Reviewed-by: Dave Chinner --- tests/xfs/310 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/xfs/310 b/tests/xfs/310 index f33a15ad028c..5c1f20ce453c 100755 --- a/tests/xfs/310 +++ b/tests/xfs/310 @@ -35,7 +35,6 @@ _cleanup() umount $SCRATCH_MNT > /dev/null 2>&1 _dmhugedisk_cleanup rm -rf $tmp.* - _scratch_mkfs >/dev/null 2>&1 } # get standard environment, filters and checks @@ -46,7 +45,7 @@ _cleanup() # real QA test starts here _supported_os Linux _supported_fs xfs -_require_scratch +_require_scratch_nocheck _require_xfs_scratch_rmapbt _require_xfs_io_command "falloc" @@ -60,7 +59,7 @@ _scratch_mount >> $seqres.full testdir=$SCRATCH_MNT/test-$seq blksz="$(_get_block_size $SCRATCH_MNT)" -umount $SCRATCH_MNT +_scratch_unmount echo "Format huge device" nr_blks=2100000 # 2^21 plus a little more @@ -110,7 +109,6 @@ test $nr_rmaps -eq 1 || xfs_db -c 'agf 0' -c 'addr rmaproot' -c 'p' $DMHUGEDISK_ echo "Check and fake-repair huge filesystem again" | tee -a $seqres.full $XFS_DB_PROG -c 'check' $DMHUGEDISK_DEV $XFS_REPAIR_PROG -n $DMHUGEDISK_DEV >> $seqres.full 2>&1 -_dmhugedisk_cleanup echo "Done"