From: Brian Foster <bfoster@redhat.com>
To: Allison Collins <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v9 10/24] xfs: Add helper function __xfs_attr_rmtval_remove
Date: Tue, 5 May 2020 08:03:13 -0400 [thread overview]
Message-ID: <20200505120313.GB60048@bfoster> (raw)
In-Reply-To: <d2effe05-04da-3c8d-5020-4fca83875051@oracle.com>
On Mon, May 04, 2020 at 02:36:39PM -0700, Allison Collins wrote:
>
>
> On 5/4/20 6:27 AM, Brian Foster wrote:
> > On Thu, Apr 30, 2020 at 03:50:02PM -0700, Allison Collins wrote:
> > > This function is similar to xfs_attr_rmtval_remove, but adapted to
> > > return EAGAIN for new transactions. 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>
> > > ---
> >
> > Looks like the commit log needs some rewording now that this is a
> > refactor patch. With that fixed:
> Ok, maybe just an extra line like "Refactor xfs_attr_rmtval_remove to add
> helper function __xfs_attr_rmtval_remove" ?
>
I'd update the first sentence to say something like that instead of how
the function is similar to xfs_attr_rmtval_remove().
Brian
> >
> > Reviewed-by: Brian Foster <bfoster@redhat.com>
> Alrighty, thank you!
>
> Allison
>
> >
> > > 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..02d1a44 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;
> > > - 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)
> > > + 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 recall 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 eff5f95..ee3337b 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-05-05 12:03 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 22:49 [PATCH v9 00/24] xfs: Delay Ready Attributes Allison Collins
2020-04-30 22:49 ` [PATCH v9 01/24] xfs: Add xfs_has_attr and subroutines Allison Collins
2020-04-30 22:49 ` [PATCH v9 02/24] xfs: Check for -ENOATTR or -EEXIST Allison Collins
2020-04-30 22:49 ` [PATCH v9 03/24] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-04-30 22:49 ` [PATCH v9 04/24] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-04-30 22:49 ` [PATCH v9 05/24] xfs: Split apart xfs_attr_leaf_addname Allison Collins
2020-05-04 17:33 ` Darrick J. Wong
2020-05-04 22:34 ` Allison Collins
2020-04-30 22:49 ` [PATCH v9 06/24] xfs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-04-30 22:49 ` [PATCH v9 07/24] xfs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-04-30 22:50 ` [PATCH v9 08/24] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-04-30 22:50 ` [PATCH v9 09/24] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-04-30 22:50 ` [PATCH v9 10/24] xfs: Add helper function __xfs_attr_rmtval_remove Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:36 ` Allison Collins
2020-05-05 12:03 ` Brian Foster [this message]
2020-05-05 17:35 ` Allison Collins
2020-05-04 17:41 ` Darrick J. Wong
2020-05-04 22:53 ` Allison Collins
2020-05-04 22:57 ` Darrick J. Wong
2020-04-30 22:50 ` [PATCH v9 11/24] xfs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:37 ` Allison Collins
2020-05-04 17:41 ` Darrick J. Wong
2020-05-04 22:55 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 12/24] xfs: Add helper function xfs_attr_node_shrink Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:37 ` Allison Collins
2020-05-04 17:42 ` Darrick J. Wong
2020-05-04 22:55 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 13/24] xfs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-05-04 13:30 ` Brian Foster
2020-05-04 22:15 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 14/24] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-05-04 18:46 ` Darrick J. Wong
2020-05-05 0:29 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 15/24] xfs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-05-04 18:47 ` Darrick J. Wong
2020-04-30 22:50 ` [PATCH v9 16/24] xfs: Add remote block helper functions Allison Collins
2020-05-04 18:55 ` Darrick J. Wong
2020-05-04 23:01 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 17/24] xfs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-05-04 18:58 ` Darrick J. Wong
2020-05-04 23:02 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 18/24] xfs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-05-04 19:00 ` Darrick J. Wong
2020-05-04 23:04 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 19/24] xfs: Simplify xfs_attr_leaf_addname Allison Collins
2020-05-04 19:03 ` Darrick J. Wong
2020-05-04 23:06 ` Allison Collins
2020-05-05 13:11 ` Brian Foster
2020-05-05 17:35 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 20/24] xfs: Simplify xfs_attr_node_addname Allison Collins
2020-05-04 19:06 ` Darrick J. Wong
2020-05-04 23:16 ` Allison Collins
2020-05-05 13:12 ` Brian Foster
2020-05-05 17:35 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 21/24] xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-05-04 19:10 ` Darrick J. Wong
2020-05-04 23:17 ` Allison Collins
2020-05-05 13:12 ` Brian Foster
2020-05-05 17:37 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 22/24] xfs: Add delay ready attr remove routines Allison Collins
2020-05-04 19:33 ` Darrick J. Wong
2020-05-05 0:26 ` Allison Collins
2020-05-05 1:44 ` Darrick J. Wong
2020-05-05 17:35 ` Allison Collins
2020-05-07 11:54 ` Brian Foster
2020-04-30 22:50 ` [PATCH v9 23/24] xfs: Add delay ready attr set routines Allison Collins
2020-05-04 19:49 ` Darrick J. Wong
2020-05-05 1:31 ` Allison Collins
2020-05-04 22:36 ` Darrick J. Wong
2020-05-05 1:32 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 24/24] xfs: Rename __xfs_attr_rmtval_remove Allison Collins
2020-05-04 19:34 ` Darrick J. Wong
2020-05-05 0:27 ` 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=20200505120313.GB60048@bfoster \
--to=bfoster@redhat.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).