From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: sandeen@sandeen.net, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 4/6] misc: convert to v5 bulkstat_single call
Date: Mon, 16 Sep 2019 15:02:49 -0700 [thread overview]
Message-ID: <20190916220249.GP2229799@magnolia> (raw)
In-Reply-To: <20190913010237.GW16973@dread.disaster.area>
On Fri, Sep 13, 2019 at 11:02:37AM +1000, Dave Chinner wrote:
> On Thu, Sep 05, 2019 at 08:35:22PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > spaceman/health.c | 4 +-
> > 7 files changed, 105 insertions(+), 32 deletions(-)
> >
> >
> > diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
> > index cc3cc93a..e8fa39ab 100644
> > --- a/fsr/xfs_fsr.c
> > +++ b/fsr/xfs_fsr.c
> > @@ -724,6 +724,7 @@ fsrfile(
> > xfs_ino_t ino)
> > {
> > struct xfs_fd fsxfd = XFS_FD_INIT_EMPTY;
> > + struct xfs_bulkstat bulkstat;
> > struct xfs_bstat statbuf;
> > jdm_fshandle_t *fshandlep;
> > int fd = -1;
> > @@ -748,12 +749,13 @@ fsrfile(
> > goto out;
> > }
> >
> > - error = xfrog_bulkstat_single(&fsxfd, ino, &statbuf);
> > + error = xfrog_bulkstat_single(&fsxfd, ino, 0, &bulkstat);
> > if (error) {
> > fsrprintf(_("unable to get bstat on %s: %s\n"),
> > fname, strerror(error));
> > goto out;
> > }
> > + xfrog_bulkstat_to_bstat(&fsxfd, &statbuf, &bulkstat);
>
> So this is so none of the rest of fsr needs to be converted to use
> the new structure versions? When will this go away?
>
> > do {
> > - struct xfs_bstat tbstat;
> > + struct xfs_bulkstat tbstat;
> > char name[64];
> > int ret;
> >
> > @@ -983,7 +985,7 @@ fsr_setup_attr_fork(
> > * this to compare against the target and determine what we
> > * need to do.
> > */
> > - ret = xfrog_bulkstat_single(&txfd, tstatbuf.st_ino, &tbstat);
> > + ret = xfrog_bulkstat_single(&txfd, tstatbuf.st_ino, 0, &tbstat);
> > if (ret) {
> > fsrprintf(_("unable to get bstat on temp file: %s\n"),
> > strerror(ret));
>
> Because this looks like we now have a combination of v1 and v5
> structures being used...
>
> >
> > diff --git a/io/swapext.c b/io/swapext.c
> > index 2b4918f8..ca024b93 100644
> > --- a/io/swapext.c
> > +++ b/io/swapext.c
> > @@ -28,6 +28,7 @@ swapext_f(
> > char **argv)
> > {
> > struct xfs_fd fxfd = XFS_FD_INIT(file->fd);
> > + struct xfs_bulkstat bulkstat;
> > int fd;
> > int error;
> > struct xfs_swapext sx;
> > @@ -48,12 +49,13 @@ swapext_f(
> > goto out;
> > }
> >
> > - error = xfrog_bulkstat_single(&fxfd, stat.st_ino, &sx.sx_stat);
> > + error = xfrog_bulkstat_single(&fxfd, stat.st_ino, 0, &bulkstat);
> > if (error) {
> > errno = error;
> > perror("bulkstat");
> > goto out;
> > }
> > + xfrog_bulkstat_to_bstat(&fxfd, &sx.sx_stat, &bulkstat);
>
> and this is required because bstat is part of the swapext ioctl ABI?
Yes. I think a lof of the retained bulkstat weirdness in fsr could go
away if (a) we maintained an open xfs_fd to the filesystem and (b)
wrapped the swapext ioctl... but there's already too much here so I
stopped short of refactoring fsr.
> > sx.sx_version = XFS_SX_VERSION;
> > sx.sx_fdtarget = file->fd;
> > sx.sx_fdtmp = fd;
> > diff --git a/libfrog/bulkstat.c b/libfrog/bulkstat.c
> > index b4468243..2a70824e 100644
> > --- a/libfrog/bulkstat.c
> > +++ b/libfrog/bulkstat.c
> > @@ -20,26 +20,99 @@ xfrog_bulkstat_prep_v1_emulation(
> > return xfd_prepare_geometry(xfd);
> > }
> >
> > +/* Bulkstat a single inode using v5 ioctl. */
> > +static int
> > +xfrog_bulkstat_single5(
> > + struct xfs_fd *xfd,
> > + uint64_t ino,
> > + unsigned int flags,
> > + struct xfs_bulkstat *bulkstat)
> > +{
> > + struct xfs_bulkstat_req *req;
> > + int ret;
> > +
> > + if (flags & ~(XFS_BULK_IREQ_SPECIAL))
> > + return EINVAL;
>
> negative error returns, please.
>
> > @@ -57,8 +57,6 @@ xfs_iterate_inodes_range_check(
> > int error;
> >
> > for (i = 0, bs = bstat; i < XFS_INODES_PER_CHUNK; i++) {
> > - struct xfs_bstat bs1;
> > -
> > if (!(inogrp->xi_allocmask & (1ULL << i)))
> > continue;
> > if (bs->bs_ino == inogrp->xi_startino + i) {
> > @@ -68,13 +66,11 @@ xfs_iterate_inodes_range_check(
> >
> > /* Load the one inode. */
> > error = xfrog_bulkstat_single(&ctx->mnt,
> > - inogrp->xi_startino + i, &bs1);
> > - if (error || bs1.bs_ino != inogrp->xi_startino + i) {
> > + inogrp->xi_startino + i, 0, bs);
> > + if (error || bs->bs_ino != inogrp->xi_startino + i) {
> > memset(bs, 0, sizeof(struct xfs_bulkstat));
> > bs->bs_ino = inogrp->xi_startino + i;
> > bs->bs_blksize = ctx->mnt_sv.f_frsize;
> > - } else {
> > - xfrog_bstat_to_bulkstat(&ctx->mnt, bs, &bs1);
> > }
> > bs++;
> > }
>
> So this immediately tears down the confusing stuff that was set up
> in the previous patch. Perhaps separate out the scrub changes and do
> both bulkstat and bulkstat_single conversions in one patch?
Ok.
--D
> -Dave.
>
> --
> Dave Chinner
> david@fromorbit.com
next prev parent reply other threads:[~2019-09-16 22:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 3:34 [PATCH 0/6] xfsprogs: port utilities to bulkstat v5 Darrick J. Wong
2019-09-06 3:34 ` [PATCH 1/6] man: add documentation for v5 bulkstat ioctl Darrick J. Wong
2019-09-06 3:35 ` [PATCH 2/6] man: add documentation for v5 inumbers ioctl Darrick J. Wong
2019-09-06 3:35 ` [PATCH 3/6] misc: convert XFS_IOC_FSBULKSTAT to XFS_IOC_BULKSTAT Darrick J. Wong
2019-09-13 0:54 ` Dave Chinner
2019-09-16 21:58 ` Darrick J. Wong
2019-09-06 3:35 ` [PATCH 4/6] misc: convert to v5 bulkstat_single call Darrick J. Wong
2019-09-13 1:02 ` Dave Chinner
2019-09-16 22:02 ` Darrick J. Wong [this message]
2019-09-06 3:35 ` [PATCH 5/6] misc: convert from XFS_IOC_FSINUMBERS to XFS_IOC_INUMBERS Darrick J. Wong
2019-09-13 1:10 ` Dave Chinner
2019-09-16 22:05 ` Darrick J. Wong
2019-09-06 3:35 ` [PATCH 6/6] libxfs: revert FSGEOMETRY v5 -> v4 hack Darrick J. Wong
2019-09-10 6:46 ` 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=20190916220249.GP2229799@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.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.