From patchwork Thu Jul 21 23:47:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9242721 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 D8F7C60574 for ; Thu, 21 Jul 2016 23:47:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAF46223A4 for ; Thu, 21 Jul 2016 23:47:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFD1027A98; Thu, 21 Jul 2016 23:47:31 +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=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 64B0E223A4 for ; Thu, 21 Jul 2016 23:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752463AbcGUXr2 (ORCPT ); Thu, 21 Jul 2016 19:47:28 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:29753 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752259AbcGUXr1 (ORCPT ); Thu, 21 Jul 2016 19:47:27 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u6LNlMup008587 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2016 23:47:23 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u6LNlM07027938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jul 2016 23:47:22 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u6LNlMDA032611; Thu, 21 Jul 2016 23:47:22 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 21 Jul 2016 16:47:21 -0700 Subject: [PATCH 10/17] xfs/179: use scratch device helpers From: "Darrick J. Wong" To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com Date: Thu, 21 Jul 2016 16:47:19 -0700 Message-ID: <146914483981.11762.15707981777571396710.stgit@birch.djwong.org> In-Reply-To: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> References: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the helper functions for scratch devices. This fixes a problem where xfs/179 fails when there's a realtime device. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/xfs/179 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tests/xfs/179 b/tests/xfs/179 index e0b0af8..18459cb 100755 --- a/tests/xfs/179 +++ b/tests/xfs/179 @@ -65,7 +65,7 @@ _pwrite_byte 0x61 0 $blksz $testdir/file1 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full echo "Change reference count" -umount $SCRATCH_MNT +_scratch_unmount echo "set refcount to -4" >> $seqres.full $XFS_DB_PROG -x -c 'agf 0' -c 'addr refcntroot' -c 'write recs[1].refcount 4294967292' $SCRATCH_DEV >> $seqres.full echo "check refcount after setting to -4" >> $seqres.full @@ -80,7 +80,7 @@ _cp_reflink $testdir/file1 $testdir/file6 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file7 >> $seqres.full echo "Check scratch fs" -umount $SCRATCH_MNT +_scratch_unmount echo "check refcount after reflinking 5 more times" >> $seqres.full $XFS_DB_PROG -c 'agf 0' -c 'addr refcntroot' -c 'p recs[1]' $SCRATCH_DEV >> $seqres.full _scratch_mount >> $seqres.full @@ -91,7 +91,7 @@ _pwrite_byte 0x62 0 $blksz $testdir/file5 >> $seqres.full _pwrite_byte 0x62 0 $blksz $testdir/file7 >> $seqres.full echo "Check scratch fs" -umount $SCRATCH_MNT +_scratch_unmount echo "check refcount after cowing 3 files" >> $seqres.full $XFS_DB_PROG -c 'agf 0' -c 'addr refcntroot' -c 'p recs[1]' $SCRATCH_DEV >> $seqres.full _scratch_mount >> $seqres.full @@ -100,10 +100,10 @@ echo "Remove reflinked files" rm -rf $testdir/file* echo "Check scratch fs" -umount $SCRATCH_MNT +_scratch_unmount echo "check refcount after removing all files" >> $seqres.full $XFS_DB_PROG -c 'agf 0' -c 'addr refcntroot' -c 'p recs[1]' $SCRATCH_DEV >> $seqres.full -$XFS_REPAIR_PROG -o force_geometry -n $SCRATCH_DEV >> $seqres.full 2>&1 +_scratch_xfs_repair -o force_geometry -n >> $seqres.full 2>&1 res=$? if [ $res -eq 0 ]; then # If repair succeeds then format the device so that the post-test