From: Allison Henderson <allison.henderson@oracle.com>
To: Chandan Babu R <chandanrlinux@gmail.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v24 11/11] xfs: Add helper function xfs_attr_leaf_addname
Date: Tue, 31 Aug 2021 11:13:19 -0700 [thread overview]
Message-ID: <8bf7a438-2ec2-b699-0753-2564c5dc06fd@oracle.com> (raw)
In-Reply-To: <8735qr9fu9.fsf@debian-BULLSEYE-live-builder-AMD64>
On 8/30/21 7:17 AM, Chandan Babu R wrote:
> On 25 Aug 2021 at 04:14, Allison Henderson wrote:
>> This patch adds a helper function xfs_attr_leaf_addname. While this
>> does help to break down xfs_attr_set_iter, it does also hoist out some
>> of the state management. This patch has been moved to the end of the
>> clean up series for further discussion.
>>
>
> Looks good to me.
>
> Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Great, thankyou!
Allison
>
>> Suggested-by: Darrick J. Wong <djwong@kernel.org>
>> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
>> ---
>> fs/xfs/libxfs/xfs_attr.c | 110 +++++++++++++++++++++------------------
>> fs/xfs/xfs_trace.h | 1 +
>> 2 files changed, 61 insertions(+), 50 deletions(-)
>>
>> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
>> index c3fdf232cd51..7150f0e051a0 100644
>> --- a/fs/xfs/libxfs/xfs_attr.c
>> +++ b/fs/xfs/libxfs/xfs_attr.c
>> @@ -284,6 +284,65 @@ xfs_attr_sf_addname(
>> return -EAGAIN;
>> }
>>
>> +STATIC int
>> +xfs_attr_leaf_addname(
>> + struct xfs_attr_item *attr)
>> +{
>> + struct xfs_da_args *args = attr->xattri_da_args;
>> + struct xfs_inode *dp = args->dp;
>> + int error;
>> +
>> + if (xfs_attr_is_leaf(dp)) {
>> + error = xfs_attr_leaf_try_add(args, attr->xattri_leaf_bp);
>> + if (error == -ENOSPC) {
>> + error = xfs_attr3_leaf_to_node(args);
>> + if (error)
>> + return error;
>> +
>> + /*
>> + * Finish any deferred work items and roll the
>> + * transaction once more. The goal here is to call
>> + * node_addname with the inode and transaction in the
>> + * same state (inode locked and joined, transaction
>> + * clean) no matter how we got to this step.
>> + *
>> + * At this point, we are still in XFS_DAS_UNINIT, but
>> + * when we come back, we'll be a node, so we'll fall
>> + * down into the node handling code below
>> + */
>> + trace_xfs_attr_set_iter_return(
>> + attr->xattri_dela_state, args->dp);
>> + return -EAGAIN;
>> + }
>> +
>> + if (error)
>> + return error;
>> +
>> + attr->xattri_dela_state = XFS_DAS_FOUND_LBLK;
>> + } else {
>> + error = xfs_attr_node_addname_find_attr(attr);
>> + if (error)
>> + return error;
>> +
>> + error = xfs_attr_node_addname(attr);
>> + if (error)
>> + return error;
>> +
>> + /*
>> + * If addname was successful, and we dont need to alloc or
>> + * remove anymore blks, we're done.
>> + */
>> + if (!args->rmtblkno &&
>> + !(args->op_flags & XFS_DA_OP_RENAME))
>> + return 0;
>> +
>> + attr->xattri_dela_state = XFS_DAS_FOUND_NBLK;
>> + }
>> +
>> + trace_xfs_attr_leaf_addname_return(attr->xattri_dela_state, args->dp);
>> + return -EAGAIN;
>> +}
>> +
>> /*
>> * Set the attribute specified in @args.
>> * This routine is meant to function as a delayed operation, and may return
>> @@ -319,57 +378,8 @@ xfs_attr_set_iter(
>> attr->xattri_leaf_bp = NULL;
>> }
>>
>> - if (xfs_attr_is_leaf(dp)) {
>> - error = xfs_attr_leaf_try_add(args,
>> - attr->xattri_leaf_bp);
>> - if (error == -ENOSPC) {
>> - error = xfs_attr3_leaf_to_node(args);
>> - if (error)
>> - return error;
>> -
>> - /*
>> - * Finish any deferred work items and roll the
>> - * transaction once more. The goal here is to
>> - * call node_addname with the inode and
>> - * transaction in the same state (inode locked
>> - * and joined, transaction clean) no matter how
>> - * we got to this step.
>> - *
>> - * At this point, we are still in
>> - * XFS_DAS_UNINIT, but when we come back, we'll
>> - * be a node, so we'll fall down into the node
>> - * handling code below
>> - */
>> - trace_xfs_attr_set_iter_return(
>> - attr->xattri_dela_state, args->dp);
>> - return -EAGAIN;
>> - } else if (error) {
>> - return error;
>> - }
>> -
>> - attr->xattri_dela_state = XFS_DAS_FOUND_LBLK;
>> - } else {
>> - error = xfs_attr_node_addname_find_attr(attr);
>> - if (error)
>> - return error;
>> + return xfs_attr_leaf_addname(attr);
>>
>> - error = xfs_attr_node_addname(attr);
>> - if (error)
>> - return error;
>> -
>> - /*
>> - * If addname was successful, and we dont need to alloc
>> - * or remove anymore blks, we're done.
>> - */
>> - if (!args->rmtblkno &&
>> - !(args->op_flags & XFS_DA_OP_RENAME))
>> - return 0;
>> -
>> - attr->xattri_dela_state = XFS_DAS_FOUND_NBLK;
>> - }
>> - trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
>> - args->dp);
>> - return -EAGAIN;
>> case XFS_DAS_FOUND_LBLK:
>> /*
>> * If there was an out-of-line value, allocate the blocks we
>> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
>> index 1033a95fbf8e..77a78b5b1a29 100644
>> --- a/fs/xfs/xfs_trace.h
>> +++ b/fs/xfs/xfs_trace.h
>> @@ -4132,6 +4132,7 @@ DEFINE_EVENT(xfs_das_state_class, name, \
>> TP_ARGS(das, ip))
>> DEFINE_DAS_STATE_EVENT(xfs_attr_sf_addname_return);
>> DEFINE_DAS_STATE_EVENT(xfs_attr_set_iter_return);
>> +DEFINE_DAS_STATE_EVENT(xfs_attr_leaf_addname_return);
>> DEFINE_DAS_STATE_EVENT(xfs_attr_node_addname_return);
>> DEFINE_DAS_STATE_EVENT(xfs_attr_remove_iter_return);
>> DEFINE_DAS_STATE_EVENT(xfs_attr_rmtval_remove_return);
>
>
next prev parent reply other threads:[~2021-08-31 18:13 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 22:44 [PATCH v24 00/11] Log Attribute Replay Allison Henderson
2021-08-24 22:44 ` [PATCH v24 01/11] xfs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
2021-08-24 22:44 ` [PATCH v24 02/11] xfs: Capture buffers for delayed ops Allison Henderson
2021-08-27 11:33 ` Chandan Babu R
2021-08-31 18:03 ` Allison Henderson
2021-08-30 17:44 ` Darrick J. Wong
2021-08-31 17:50 ` Allison Henderson
2021-09-18 0:02 ` Darrick J. Wong
2021-08-24 22:44 ` [PATCH v24 03/11] xfs: Set up infrastructure for log atrribute replay Allison Henderson
2021-08-27 14:17 ` Chandan Babu R
2021-08-31 18:03 ` Allison Henderson
2021-08-31 0:48 ` Dave Chinner
2021-08-31 19:03 ` Allison Henderson
2021-08-31 21:52 ` Dave Chinner
2021-09-01 5:34 ` Allison Henderson
2021-08-24 22:44 ` [PATCH v24 04/11] xfs: Implement attr logging and replay Allison Henderson
2021-08-30 7:47 ` Chandan Babu R
2021-08-31 18:11 ` Allison Henderson
2021-08-24 22:44 ` [PATCH v24 05/11] RFC xfs: Skip flip flags for delayed attrs Allison Henderson
2021-08-30 10:15 ` Chandan Babu R
2021-08-31 18:11 ` Allison Henderson
2021-08-24 22:44 ` [PATCH v24 06/11] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-08-30 10:27 ` Chandan Babu R
2021-08-31 18:12 ` Allison Henderson
2021-09-01 3:47 ` Dave Chinner
2021-09-01 5:34 ` Allison Henderson
2021-08-24 22:44 ` [PATCH v24 07/11] xfs: Remove unused xfs_attr_*_args Allison Henderson
2021-08-24 22:44 ` [PATCH v24 08/11] xfs: Add log attribute error tag Allison Henderson
2021-08-24 22:44 ` [PATCH v24 09/11] xfs: Add larp debug option Allison Henderson
2021-08-30 12:03 ` Chandan Babu R
2021-08-31 18:12 ` Allison Henderson
2021-08-24 22:44 ` [PATCH v24 10/11] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2021-08-24 22:44 ` [PATCH v24 11/11] xfs: Add helper function xfs_attr_leaf_addname Allison Henderson
2021-08-30 14:17 ` Chandan Babu R
2021-08-31 18:13 ` Allison Henderson [this message]
2021-08-31 0:20 ` [PATCH v24 00/11] Log Attribute Replay Dave Chinner
2021-08-31 18:27 ` Allison Henderson
2021-09-01 6:29 ` Dave Chinner
2021-09-01 7:30 ` [PATCH 0/5] xfs: various logged attribute fixes Dave Chinner
2021-09-01 7:30 ` [PATCH 1/5] xfs: fix fallthrough annotations in xfs_attr_set_iter() Dave Chinner
2021-09-01 7:30 ` [PATCH 2/5] xfs: fix flags passed to kvmalloc() by xfs_attri_init() Dave Chinner
2021-09-01 7:30 ` [PATCH 3/5] xfs: hide log iovec alignment constraints Dave Chinner
2021-09-01 7:30 ` [PATCH 4/5] xfs: fix attribute log iovec sizing Dave Chinner
2021-09-01 7:30 ` [PATCH 5/5] [RFC] xfs: don't commit the first deferred transaction without intents Dave Chinner
2021-09-01 21:43 ` [PATCH 0/5] xfs: various logged attribute fixes Allison Henderson
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=8bf7a438-2ec2-b699-0753-2564c5dc06fd@oracle.com \
--to=allison.henderson@oracle.com \
--cc=chandanrlinux@gmail.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).