From patchwork Tue Nov 10 18:03:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11894991 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 51C7F138B for ; Tue, 10 Nov 2020 18:05:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BD0E20781 for ; Tue, 10 Nov 2020 18:05:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="TPoHAs1Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726307AbgKJSFg (ORCPT ); Tue, 10 Nov 2020 13:05:36 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:53946 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726557AbgKJSFg (ORCPT ); Tue, 10 Nov 2020 13:05:36 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0AAHxvD2048936; Tue, 10 Nov 2020 18:05:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=yHilT37ysKKSl2UrqKLjocbCMkhcZdbTrl9pEBxAkgE=; b=TPoHAs1Q40HjgeGa2QkEkkO0ix88EwEoleqwUukV/UUVCpwHJjDdxw4J+Vh+N7coLHnt MgXx3U+JD9SesvjsCDuJEJEkVU+/NswKpo+r6RlER3pWlnvRtTlAg4bghblJcZQ3Xo8U lSQcWGErq98mt34HiN0WhY0lsxTcXWg9gdJU8nC54iO2BvnEV7yGKQiQqR1kQni5P4V0 PyQX6R9pQxx4Nt0cC5G7glSM6i91h5X/dz2p6Bdx51j/4l+QmgtZRjN6U7oWls5XAd66 4WnHHZWtZUeaOnSv9/1l2PUAVjYmNaheHniJ3d+tYhRScQJCXRmZskdRxNxYtMTrRN9P JA== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2130.oracle.com with ESMTP id 34nh3aw9g1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 10 Nov 2020 18:05:32 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0AAI16Y9092659; Tue, 10 Nov 2020 18:03:31 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3020.oracle.com with ESMTP id 34qgp76m07-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Nov 2020 18:03:31 +0000 Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0AAI3US2004782; Tue, 10 Nov 2020 18:03:30 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 10 Nov 2020 10:03:30 -0800 Subject: [PATCH 4/9] xfs: remove unnecessary parameter from scrub_scan_estimate_blocks From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: Allison Henderson , Christoph Hellwig , linux-xfs@vger.kernel.org Date: Tue, 10 Nov 2020 10:03:29 -0800 Message-ID: <160503140903.1201232.5218288641888297738.stgit@magnolia> In-Reply-To: <160503138275.1201232.927488386999483691.stgit@magnolia> References: <160503138275.1201232.927488386999483691.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9801 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011100126 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9801 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 spamscore=0 suspectscore=2 mlxlogscore=999 impostorscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011100126 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong The only caller that cares about the file counts uses it to compute the number of files used, so return that and save a parameter. Signed-off-by: Darrick J. Wong Reviewed-by: Allison Henderson Reviewed-by: Christoph Hellwig --- scrub/fscounters.c | 8 +++----- scrub/fscounters.h | 2 +- scrub/phase6.c | 7 +++---- scrub/phase7.c | 5 +---- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/scrub/fscounters.c b/scrub/fscounters.c index e9901fcdf6df..9a240d49477b 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -116,7 +116,7 @@ scrub_count_all_inodes( } /* - * Estimate the number of blocks and inodes in the filesystem. Returns 0 + * Estimate the number of blocks and used inodes in the filesystem. Returns 0 * or a positive error number. */ int @@ -126,8 +126,7 @@ scrub_scan_estimate_blocks( unsigned long long *d_bfree, unsigned long long *r_blocks, unsigned long long *r_bfree, - unsigned long long *f_files, - unsigned long long *f_free) + unsigned long long *f_files_used) { struct xfs_fsop_counts fc; int error; @@ -141,8 +140,7 @@ scrub_scan_estimate_blocks( *d_bfree = fc.freedata; *r_blocks = ctx->mnt.fsgeom.rtblocks; *r_bfree = fc.freertx; - *f_files = fc.allocino; - *f_free = fc.freeino; + *f_files_used = fc.allocino - fc.freeino; return 0; } diff --git a/scrub/fscounters.h b/scrub/fscounters.h index 1fae58a6b287..13bd9967f004 100644 --- a/scrub/fscounters.h +++ b/scrub/fscounters.h @@ -9,7 +9,7 @@ int scrub_scan_estimate_blocks(struct scrub_ctx *ctx, unsigned long long *d_blocks, unsigned long long *d_bfree, unsigned long long *r_blocks, unsigned long long *r_bfree, - unsigned long long *f_files, unsigned long long *f_free); + unsigned long long *f_files_used); int scrub_count_all_inodes(struct scrub_ctx *ctx, uint64_t *count); #endif /* XFS_SCRUB_FSCOUNTERS_H_ */ diff --git a/scrub/phase6.c b/scrub/phase6.c index 8d976732d8e1..87828b60fbed 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -719,12 +719,11 @@ phase6_estimate( unsigned long long d_bfree; unsigned long long r_blocks; unsigned long long r_bfree; - unsigned long long f_files; - unsigned long long f_free; + unsigned long long dontcare; int ret; - ret = scrub_scan_estimate_blocks(ctx, &d_blocks, &d_bfree, - &r_blocks, &r_bfree, &f_files, &f_free); + ret = scrub_scan_estimate_blocks(ctx, &d_blocks, &d_bfree, &r_blocks, + &r_bfree, &dontcare); if (ret) { str_liberror(ctx, ret, _("estimating verify work")); return ret; diff --git a/scrub/phase7.c b/scrub/phase7.c index 96876f7c0596..bc652ab6f44a 100644 --- a/scrub/phase7.c +++ b/scrub/phase7.c @@ -111,8 +111,6 @@ phase7_func( unsigned long long d_bfree; unsigned long long r_blocks; unsigned long long r_bfree; - unsigned long long f_files; - unsigned long long f_free; bool complain; int ip; int error; @@ -160,7 +158,7 @@ phase7_func( } error = scrub_scan_estimate_blocks(ctx, &d_blocks, &d_bfree, &r_blocks, - &r_bfree, &f_files, &f_free); + &r_bfree, &used_files); if (error) { str_liberror(ctx, error, _("estimating verify work")); return error; @@ -177,7 +175,6 @@ phase7_func( /* Report on what we found. */ used_data = cvt_off_fsb_to_b(&ctx->mnt, d_blocks - d_bfree); used_rt = cvt_off_fsb_to_b(&ctx->mnt, r_blocks - r_bfree); - used_files = f_files - f_free; stat_data = totalcount.dbytes; stat_rt = totalcount.rbytes;