From patchwork Wed Oct 19 05:33:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9383619 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 8431760487 for ; Wed, 19 Oct 2016 05:48:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75ED529656 for ; Wed, 19 Oct 2016 05:48:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A58829682; Wed, 19 Oct 2016 05:48:04 +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 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 CF78629656 for ; Wed, 19 Oct 2016 05:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756292AbcJSFr4 (ORCPT ); Wed, 19 Oct 2016 01:47:56 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:32523 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755666AbcJSFrv (ORCPT ); Wed, 19 Oct 2016 01:47:51 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="12090993" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 19 Oct 2016 13:47:47 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 59B21466FE0F; Wed, 19 Oct 2016 13:47:47 +0800 (CST) Received: from localhost.localdomain (10.167.220.69) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.279.2; Wed, 19 Oct 2016 13:47:46 +0800 From: Xiao Yang To: CC: , , Xiao Yang Subject: [PATCH v2] xfs: remove the device parameter from __populate_check_xfs_dir Date: Wed, 19 Oct 2016 13:33:07 +0800 Message-ID: <1476855187-7122-1-git-send-email-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20161019044241.GJ14023@dastard> References: <20161019044241.GJ14023@dastard> MIME-Version: 1.0 X-Originating-IP: [10.167.220.69] X-yoursite-MailScanner-ID: 59B21466FE0F.ABD61 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In commit c08ebd092("xfs: fix $XFS_DB_PROG usage"), the need for callers to pass the device to populate into __populate_check_xfs_dir() was removed. So we can now clean up all the callers by removing the device parameter. Signed-off-by: Xiao Yang Reviewed-by: Darrick J. Wong --- tests/xfs/099 | 2 +- tests/xfs/100 | 2 +- tests/xfs/101 | 2 +- tests/xfs/102 | 2 +- tests/xfs/105 | 2 +- tests/xfs/112 | 2 +- tests/xfs/113 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/xfs/099 b/tests/xfs/099 index ebc02dd..85193ab 100755 --- a/tests/xfs/099 +++ b/tests/xfs/099 @@ -75,7 +75,7 @@ echo "+ check fs" _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" echo "+ check dir" -__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" block +__populate_check_xfs_dir "${inode}" block echo "+ corrupt dir" _scratch_xfs_db -x -c "inode ${inode}" -c 'dblock 0' -c "stack" -c "blocktrash -x 32 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full diff --git a/tests/xfs/100 b/tests/xfs/100 index 2412c81..3bfafce 100755 --- a/tests/xfs/100 +++ b/tests/xfs/100 @@ -75,7 +75,7 @@ echo "+ check fs" _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" echo "+ check dir" -__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" leaf +__populate_check_xfs_dir "${inode}" leaf echo "+ corrupt dir" loff=0 diff --git a/tests/xfs/101 b/tests/xfs/101 index 679940f..d3abd19 100755 --- a/tests/xfs/101 +++ b/tests/xfs/101 @@ -75,7 +75,7 @@ echo "+ check fs" _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" echo "+ check dir" -__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" leaf +__populate_check_xfs_dir "${inode}" leaf echo "+ corrupt dir" _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "stack" -c "blocktrash -x 32 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full diff --git a/tests/xfs/102 b/tests/xfs/102 index 8018a9e..cf0d7a6 100755 --- a/tests/xfs/102 +++ b/tests/xfs/102 @@ -75,7 +75,7 @@ echo "+ check fs" _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" echo "+ check dir" -__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" node +__populate_check_xfs_dir "${inode}" node echo "+ corrupt dir" loff=0 diff --git a/tests/xfs/105 b/tests/xfs/105 index 27ee4b3..07ccf00 100755 --- a/tests/xfs/105 +++ b/tests/xfs/105 @@ -75,7 +75,7 @@ echo "+ check fs" _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" echo "+ check dir" -__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" node +__populate_check_xfs_dir "${inode}" node echo "+ corrupt dir" loff="${leaf_lblk}" diff --git a/tests/xfs/112 b/tests/xfs/112 index c237f03..84f1f1d 100755 --- a/tests/xfs/112 +++ b/tests/xfs/112 @@ -75,7 +75,7 @@ echo "+ check fs" _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" echo "+ check dir" -__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" node +__populate_check_xfs_dir "${inode}" node echo "+ corrupt dir" loff="${node_lblk}" diff --git a/tests/xfs/113 b/tests/xfs/113 index 6d6e6fd..ec328bc 100755 --- a/tests/xfs/113 +++ b/tests/xfs/113 @@ -75,7 +75,7 @@ echo "+ check fs" _scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail" echo "+ check dir" -__populate_check_xfs_dir "${SCRATCH_DEV}" "${inode}" btree +__populate_check_xfs_dir "${inode}" btree echo "+ corrupt dir" loff=0