From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Allison Collins <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v11 10/25] xfs: Refactor xfs_attr_rmtval_remove
Date: Tue, 21 Jul 2020 17:24:46 -0700 [thread overview]
Message-ID: <20200722002446.GM3151642@magnolia> (raw)
In-Reply-To: <20200721233118.GH3151642@magnolia>
On Tue, Jul 21, 2020 at 04:31:18PM -0700, Darrick J. Wong wrote:
> On Mon, Jul 20, 2020 at 05:15:51PM -0700, Allison Collins wrote:
> > Refactor xfs_attr_rmtval_remove to add helper function
> > __xfs_attr_rmtval_remove. We will use this later when we introduce
> > delayed attributes. This function will eventually replace
> > xfs_attr_rmtval_remove
> >
> > Signed-off-by: Allison Collins <allison.henderson@oracle.com>
> > Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
> > Reviewed-by: Brian Foster <bfoster@redhat.com>
> > ---
> > fs/xfs/libxfs/xfs_attr_remote.c | 46 ++++++++++++++++++++++++++++++++---------
> > fs/xfs/libxfs/xfs_attr_remote.h | 1 +
> > 2 files changed, 37 insertions(+), 10 deletions(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
> > index 4d51969..9b4c173 100644
> > --- a/fs/xfs/libxfs/xfs_attr_remote.c
> > +++ b/fs/xfs/libxfs/xfs_attr_remote.c
> > @@ -681,7 +681,7 @@ xfs_attr_rmtval_remove(
> > xfs_dablk_t lblkno;
> > int blkcnt;
> > int error = 0;
> > - int done = 0;
> > + int retval = 0;
> >
> > trace_xfs_attr_rmtval_remove(args);
> >
> > @@ -693,14 +693,10 @@ xfs_attr_rmtval_remove(
> > */
> > lblkno = args->rmtblkno;
> > blkcnt = args->rmtblkcnt;
>
> Er... I think these local variables can go away here, right?
>
> --D
>
> > - while (!done) {
> > - error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,
> > - XFS_BMAPI_ATTRFORK, 1, &done);
> > - if (error)
> > - return error;
> > - error = xfs_defer_finish(&args->trans);
> > - if (error)
> > - return error;
> > + do {
> > + retval = __xfs_attr_rmtval_remove(args);
> > + if (retval && retval != EAGAIN)
Also this has to be -EAGAIN. Amazingly, nothing in fstests blew up on
this.
--D
> > + return retval;
> >
> > /*
> > * Close out trans and start the next one in the chain.
> > @@ -708,6 +704,36 @@ xfs_attr_rmtval_remove(
> > error = xfs_trans_roll_inode(&args->trans, args->dp);
> > if (error)
> > return error;
> > - }
> > + } while (retval == -EAGAIN);
> > +
> > return 0;
> > }
> > +
> > +/*
> > + * Remove the value associated with an attribute by deleting the out-of-line
> > + * buffer that it is stored on. Returns EAGAIN for the caller to refresh the
> > + * transaction and re-call the function
> > + */
> > +int
> > +__xfs_attr_rmtval_remove(
> > + struct xfs_da_args *args)
> > +{
> > + int error, done;
> > +
> > + /*
> > + * Unmap value blocks for this attr.
> > + */
> > + error = xfs_bunmapi(args->trans, args->dp, args->rmtblkno,
> > + args->rmtblkcnt, XFS_BMAPI_ATTRFORK, 1, &done);
> > + if (error)
> > + return error;
> > +
> > + error = xfs_defer_finish(&args->trans);
> > + if (error)
> > + return error;
> > +
> > + if (!done)
> > + return -EAGAIN;
> > +
> > + return error;
> > +}
> > diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
> > index 3616e88..9eee615 100644
> > --- a/fs/xfs/libxfs/xfs_attr_remote.h
> > +++ b/fs/xfs/libxfs/xfs_attr_remote.h
> > @@ -14,4 +14,5 @@ int xfs_attr_rmtval_remove(struct xfs_da_args *args);
> > int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
> > xfs_buf_flags_t incore_flags);
> > int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
> > +int __xfs_attr_rmtval_remove(struct xfs_da_args *args);
> > #endif /* __XFS_ATTR_REMOTE_H__ */
> > --
> > 2.7.4
> >
next prev parent reply other threads:[~2020-07-22 0:24 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 0:15 [PATCH v11 00/25] xfs: Delay Ready Attributes Allison Collins
2020-07-21 0:15 ` [PATCH v11 01/25] xfs: Add xfs_has_attr and subroutines Allison Collins
2020-07-21 23:26 ` Darrick J. Wong
2020-07-24 2:24 ` Dave Chinner
2020-07-25 2:49 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 02/25] xfs: Check for -ENOATTR or -EEXIST Allison Collins
2020-07-21 0:15 ` [PATCH v11 03/25] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-07-21 0:15 ` [PATCH v11 04/25] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-07-21 0:15 ` [PATCH v11 05/25] xfs: Split apart xfs_attr_leaf_addname Allison Collins
2020-07-21 23:19 ` Darrick J. Wong
2020-07-25 0:07 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 06/25] xfs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-07-21 0:15 ` [PATCH v11 07/25] xfs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-07-21 0:15 ` [PATCH v11 08/25] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-07-21 0:15 ` [PATCH v11 09/25] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-07-21 0:15 ` [PATCH v11 10/25] xfs: Refactor xfs_attr_rmtval_remove Allison Collins
2020-07-21 23:31 ` Darrick J. Wong
2020-07-22 0:24 ` Darrick J. Wong [this message]
2020-07-25 0:08 ` Allison Collins
2020-07-25 0:46 ` Darrick J. Wong
2020-07-25 0:07 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 11/25] xfs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-07-21 0:15 ` [PATCH v11 12/25] xfs: Add helper function xfs_attr_node_shrink Allison Collins
2020-07-21 0:15 ` [PATCH v11 13/25] xfs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-07-21 23:34 ` Darrick J. Wong
2020-07-25 0:08 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 14/25] xfs: Remove xfs_trans_roll in xfs_attr_node_removename Allison Collins
2020-07-21 23:38 ` Darrick J. Wong
2020-07-25 0:08 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 15/25] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-07-21 0:15 ` [PATCH v11 16/25] xfs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-07-21 0:15 ` [PATCH v11 17/25] xfs: Add remote block helper functions Allison Collins
2020-07-21 0:15 ` [PATCH v11 18/25] xfs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-07-21 0:16 ` [PATCH v11 19/25] xfs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-07-21 0:16 ` [PATCH v11 20/25] xfs: Simplify xfs_attr_leaf_addname Allison Collins
2020-07-21 23:39 ` Darrick J. Wong
2020-07-25 0:07 ` Allison Collins
2020-07-21 0:16 ` [PATCH v11 21/25] xfs: Simplify xfs_attr_node_addname Allison Collins
2020-07-21 23:41 ` Darrick J. Wong
2020-07-25 0:08 ` Allison Collins
2020-07-21 0:16 ` [PATCH v11 22/25] xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-07-21 0:16 ` [PATCH v11 23/25] xfs: Add delay ready attr remove routines Allison Collins
2020-07-21 0:16 ` [PATCH v11 24/25] xfs: Add delay ready attr set routines Allison Collins
2020-07-21 0:16 ` [PATCH v11 25/25] xfs: Rename __xfs_attr_rmtval_remove Allison Collins
2020-07-24 3:41 ` [PATCH v11 00/25] xfs: Delay Ready Attributes Dave Chinner
2020-07-24 5:35 ` Dave Chinner
2020-07-25 2:50 ` Allison Collins
2020-07-25 2:49 ` Allison Collins
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=20200722002446.GM3151642@magnolia \
--to=darrick.wong@oracle.com \
--cc=allison.henderson@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).