From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: sandeen@sandeen.net, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/5] xfs: remove unnecessary parameter from scrub_scan_estimate_blocks
Date: Tue, 27 Oct 2020 08:33:50 -0700 [thread overview]
Message-ID: <20201027153350.GC853509@magnolia> (raw)
In-Reply-To: <0b7fc968-8820-15c0-b84b-d430fddec3df@oracle.com>
On Mon, Oct 26, 2020 at 10:35:46PM -0700, Allison Henderson wrote:
>
>
> On 10/26/20 4:32 PM, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > 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 <darrick.wong@oracle.com>
> > ---
> > 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;
> Just a nit, I think I might have put in:
> if(f_files_used)
> *f_files_used = fc.allocino - fc.freeino;
>
> That way calling functions that don't care can just pass NULL, instead of
> declaring a "dontcare" variable that has no other use. Though I suppose
> none of the other variables do that.
<shrug> There's only two callers, and they both pass a pointer, so I
didn't bother...
--D
> Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
> Allison
> > 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;
> >
next prev parent reply other threads:[~2020-10-27 15:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 23:31 [PATCH 0/5] xfsprogs: fixes for 5.10 Darrick J. Wong
2020-10-26 23:31 ` [PATCH 1/5] mkfs: allow users to specify rtinherit=0 Darrick J. Wong
2020-10-27 5:35 ` Allison Henderson
2020-10-27 17:22 ` Eric Sandeen
2020-10-27 17:24 ` [PATCH 1.5/5] mkfs: clarify valid "inherit" option values Eric Sandeen
2020-10-27 17:40 ` Darrick J. Wong
2020-10-27 17:49 ` Eric Sandeen
2020-10-28 7:32 ` Christoph Hellwig
2020-10-27 17:50 ` [PATCH 1.5/5 V2] " Eric Sandeen
2020-10-27 18:37 ` Darrick J. Wong
2020-10-28 7:32 ` [PATCH 1/5] mkfs: allow users to specify rtinherit=0 Christoph Hellwig
2020-10-26 23:32 ` [PATCH 2/5] xfs: remove unnecessary parameter from scrub_scan_estimate_blocks Darrick J. Wong
2020-10-27 5:35 ` Allison Henderson
2020-10-27 15:33 ` Darrick J. Wong [this message]
2020-10-29 18:33 ` Darrick J. Wong
2020-10-29 18:38 ` Allison Henderson
2020-10-28 7:33 ` Christoph Hellwig
2020-10-26 23:32 ` [PATCH 3/5] xfs_db: report ranges of invalid rt blocks Darrick J. Wong
2020-10-27 5:35 ` Allison Henderson
2020-10-28 7:33 ` Christoph Hellwig
2020-10-26 23:32 ` [PATCH 4/5] xfs_repair: skip the rmap and refcount btree checks when the levels are garbage Darrick J. Wong
2020-10-27 5:35 ` Allison Henderson
2020-10-28 7:34 ` Christoph Hellwig
2020-10-26 23:32 ` [PATCH 5/5] xfs_repair: correctly detect partially written extents Darrick J. Wong
2020-10-27 5:52 ` Allison Henderson
2020-10-28 7:35 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027153350.GC853509@magnolia \
--to=darrick.wong@oracle.com \
--cc=allison.henderson@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.