From: Allison Henderson <allison.henderson@oracle.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v15 09/22] xfs: Hoist xfs_attr_leaf_addname
Date: Tue, 2 Mar 2021 01:26:20 -0700 [thread overview]
Message-ID: <fe145942-77fa-bec7-2e79-d420c3202a98@oracle.com> (raw)
In-Reply-To: <20210301181913.GI7272@magnolia>
On 3/1/21 11:19 AM, Darrick J. Wong wrote:
> On Thu, Feb 18, 2021 at 09:53:35AM -0700, Allison Henderson wrote:
>> This patch hoists xfs_attr_leaf_addname into the calling function. The
>> goal being to get all the code that will require state management into
>> the same scope. This isn't particuarly asetheic right away, but it is a
>
> "aesthetic"
>
>> preliminary step to to manageing the state machine code.
>
> "to merging in" ?
>
> The goto label is ugly, but afaict this patch moves code and the next
> one rearranges it the way you ultimately want it, right?
>
> With spelling fixed,
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
>
Ok, will fix spelling nits. Thank you!
Allison
> --D
>
>
>> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>> ---
>> fs/xfs/libxfs/xfs_attr.c | 209 ++++++++++++++++++++++-------------------------
>> 1 file changed, 96 insertions(+), 113 deletions(-)
>>
>> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
>> index 19a532a..bfd4466 100644
>> --- a/fs/xfs/libxfs/xfs_attr.c
>> +++ b/fs/xfs/libxfs/xfs_attr.c
>> @@ -44,9 +44,9 @@ STATIC int xfs_attr_shortform_addname(xfs_da_args_t *args);
>> * Internal routines when attribute list is one block.
>> */
>> STATIC int xfs_attr_leaf_get(xfs_da_args_t *args);
>> -STATIC int xfs_attr_leaf_addname(xfs_da_args_t *args);
>> STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args);
>> STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp);
>> +STATIC int xfs_attr_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp);
>>
>> /*
>> * Internal routines when attribute list is more than one block.
>> @@ -269,8 +269,9 @@ xfs_attr_set_args(
>> struct xfs_da_args *args)
>> {
>> struct xfs_inode *dp = args->dp;
>> + struct xfs_buf *bp = NULL;
>> struct xfs_da_state *state = NULL;
>> - int error = 0;
>> + int forkoff, error = 0;
>> int retval = 0;
>>
>> /*
>> @@ -286,10 +287,101 @@ xfs_attr_set_args(
>> }
>>
>> if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
>> - error = xfs_attr_leaf_addname(args);
>> - if (error != -ENOSPC)
>> + error = xfs_attr_leaf_try_add(args, bp);
>> + if (error == -ENOSPC)
>> + goto node;
>> + else if (error)
>> + return error;
>> +
>> + /*
>> + * Commit the transaction that added the attr name so that
>> + * later routines can manage their own transactions.
>> + */
>> + error = xfs_trans_roll_inode(&args->trans, dp);
>> + if (error)
>> + return error;
>> +
>> + /*
>> + * If there was an out-of-line value, allocate the blocks we
>> + * identified for its storage and copy the value. This is done
>> + * after we create the attribute so that we don't overflow the
>> + * maximum size of a transaction and/or hit a deadlock.
>> + */
>> + if (args->rmtblkno > 0) {
>> + error = xfs_attr_rmtval_set(args);
>> + if (error)
>> + return error;
>> + }
>> +
>> + if (!(args->op_flags & XFS_DA_OP_RENAME)) {
>> + /*
>> + * Added a "remote" value, just clear the incomplete
>> + *flag.
>> + */
>> + if (args->rmtblkno > 0)
>> + error = xfs_attr3_leaf_clearflag(args);
>> +
>> + return error;
>> + }
>> +
>> + /*
>> + * If this is an atomic rename operation, we must "flip" the
>> + * incomplete flags on the "new" and "old" attribute/value pairs
>> + * so that one disappears and one appears atomically. Then we
>> + * must remove the "old" attribute/value pair.
>> + *
>> + * In a separate transaction, set the incomplete flag on the
>> + * "old" attr and clear the incomplete flag on the "new" attr.
>> + */
>> +
>> + error = xfs_attr3_leaf_flipflags(args);
>> + if (error)
>> + return error;
>> + /*
>> + * Commit the flag value change and start the next trans in
>> + * series.
>> + */
>> + error = xfs_trans_roll_inode(&args->trans, args->dp);
>> + if (error)
>> + return error;
>> +
>> + /*
>> + * Dismantle the "old" attribute/value pair by removing a
>> + * "remote" value (if it exists).
>> + */
>> + xfs_attr_restore_rmt_blk(args);
>> +
>> + if (args->rmtblkno) {
>> + error = xfs_attr_rmtval_invalidate(args);
>> + if (error)
>> + return error;
>> +
>> + error = xfs_attr_rmtval_remove(args);
>> + if (error)
>> + return error;
>> + }
>> +
>> + /*
>> + * Read in the block containing the "old" attr, then remove the
>> + * "old" attr from that block (neat, huh!)
>> + */
>> + error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno,
>> + &bp);
>> + if (error)
>> return error;
>>
>> + xfs_attr3_leaf_remove(bp, args);
>> +
>> + /*
>> + * If the result is small enough, shrink it all into the inode.
>> + */
>> + forkoff = xfs_attr_shortform_allfit(bp, dp);
>> + if (forkoff)
>> + error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
>> + /* bp is gone due to xfs_da_shrink_inode */
>> +
>> + return error;
>> +node:
>> /*
>> * Promote the attribute list to the Btree format.
>> */
>> @@ -731,115 +823,6 @@ xfs_attr_leaf_try_add(
>> return retval;
>> }
>>
>> -
>> -/*
>> - * Add a name to the leaf attribute list structure
>> - *
>> - * This leaf block cannot have a "remote" value, we only call this routine
>> - * if bmap_one_block() says there is only one block (ie: no remote blks).
>> - */
>> -STATIC int
>> -xfs_attr_leaf_addname(
>> - struct xfs_da_args *args)
>> -{
>> - int error, forkoff;
>> - struct xfs_buf *bp = NULL;
>> - struct xfs_inode *dp = args->dp;
>> -
>> - trace_xfs_attr_leaf_addname(args);
>> -
>> - error = xfs_attr_leaf_try_add(args, bp);
>> - if (error)
>> - return error;
>> -
>> - /*
>> - * Commit the transaction that added the attr name so that
>> - * later routines can manage their own transactions.
>> - */
>> - error = xfs_trans_roll_inode(&args->trans, dp);
>> - if (error)
>> - return error;
>> -
>> - /*
>> - * If there was an out-of-line value, allocate the blocks we
>> - * identified for its storage and copy the value. This is done
>> - * after we create the attribute so that we don't overflow the
>> - * maximum size of a transaction and/or hit a deadlock.
>> - */
>> - if (args->rmtblkno > 0) {
>> - error = xfs_attr_rmtval_set(args);
>> - if (error)
>> - return error;
>> - }
>> -
>> - if (!(args->op_flags & XFS_DA_OP_RENAME)) {
>> - /*
>> - * Added a "remote" value, just clear the incomplete flag.
>> - */
>> - if (args->rmtblkno > 0)
>> - error = xfs_attr3_leaf_clearflag(args);
>> -
>> - return error;
>> - }
>> -
>> - /*
>> - * If this is an atomic rename operation, we must "flip" the incomplete
>> - * flags on the "new" and "old" attribute/value pairs so that one
>> - * disappears and one appears atomically. Then we must remove the "old"
>> - * attribute/value pair.
>> - *
>> - * In a separate transaction, set the incomplete flag on the "old" attr
>> - * and clear the incomplete flag on the "new" attr.
>> - */
>> -
>> - error = xfs_attr3_leaf_flipflags(args);
>> - if (error)
>> - return error;
>> - /*
>> - * Commit the flag value change and start the next trans in series.
>> - */
>> - error = xfs_trans_roll_inode(&args->trans, args->dp);
>> - if (error)
>> - return error;
>> -
>> - /*
>> - * Dismantle the "old" attribute/value pair by removing a "remote" value
>> - * (if it exists).
>> - */
>> - xfs_attr_restore_rmt_blk(args);
>> -
>> - if (args->rmtblkno) {
>> - error = xfs_attr_rmtval_invalidate(args);
>> - if (error)
>> - return error;
>> -
>> - error = xfs_attr_rmtval_remove(args);
>> - if (error)
>> - return error;
>> - }
>> -
>> - /*
>> - * Read in the block containing the "old" attr, then remove the "old"
>> - * attr from that block (neat, huh!)
>> - */
>> - error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno,
>> - &bp);
>> - if (error)
>> - return error;
>> -
>> - xfs_attr3_leaf_remove(bp, args);
>> -
>> - /*
>> - * If the result is small enough, shrink it all into the inode.
>> - */
>> - forkoff = xfs_attr_shortform_allfit(bp, dp);
>> - if (forkoff)
>> - error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
>> - /* bp is gone due to xfs_da_shrink_inode */
>> -
>> - return error;
>> -}
>> -
>> /*
>> * Return EEXIST if attr is found, or ENOATTR if not
>> */
>> --
>> 2.7.4
>>
next prev parent reply other threads:[~2021-03-03 3:18 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 16:53 [PATCH v15 00/22] xfs: Delayed Attributes Allison Henderson
2021-02-18 16:53 ` [PATCH v15 01/22] xfs: Add helper xfs_attr_node_remove_step Allison Henderson
2021-02-24 15:03 ` Brian Foster
2021-02-25 6:17 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 02/22] xfs: Add xfs_attr_node_remove_cleanup Allison Henderson
2021-02-24 15:03 ` Brian Foster
2021-02-25 6:17 ` Allison Henderson
2021-02-26 3:00 ` Darrick J. Wong
2021-02-27 0:48 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 03/22] xfs: Hoist transaction handling in xfs_attr_node_remove_step Allison Henderson
2021-02-24 15:04 ` Brian Foster
2021-02-25 6:18 ` Allison Henderson
2021-02-26 3:02 ` Darrick J. Wong
2021-02-27 0:48 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 04/22] xfs: Hoist xfs_attr_set_shortform Allison Henderson
2021-02-24 15:04 ` Brian Foster
2021-02-25 6:18 ` Allison Henderson
2021-02-26 3:03 ` Darrick J. Wong
2021-02-27 0:48 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 05/22] xfs: Add helper xfs_attr_set_fmt Allison Henderson
2021-02-24 15:04 ` Brian Foster
2021-02-25 6:18 ` Allison Henderson
2021-02-26 3:07 ` Darrick J. Wong
2021-02-27 0:49 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 06/22] xfs: Separate xfs_attr_node_addname and xfs_attr_node_addname_work Allison Henderson
2021-02-24 15:04 ` Brian Foster
2021-02-25 6:18 ` Allison Henderson
2021-02-26 4:02 ` Darrick J. Wong
2021-02-27 0:54 ` Allison Henderson
2021-03-01 18:00 ` Darrick J. Wong
2021-03-02 8:26 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 07/22] xfs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-02-24 15:04 ` Brian Foster
2021-02-25 6:18 ` Allison Henderson
2021-02-26 4:06 ` Darrick J. Wong
2021-02-27 0:54 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 08/22] xfs: Hoist xfs_attr_node_addname Allison Henderson
2021-02-24 18:42 ` Brian Foster
2021-02-25 6:19 ` Allison Henderson
2021-03-01 18:05 ` Darrick J. Wong
2021-03-02 8:26 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 09/22] xfs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-02-24 18:42 ` Brian Foster
2021-02-25 6:19 ` Allison Henderson
2021-02-25 14:20 ` Brian Foster
2021-03-01 18:19 ` Darrick J. Wong
2021-03-02 8:26 ` Allison Henderson [this message]
2021-02-18 16:53 ` [PATCH v15 10/22] xfs: Hoist node transaction handling Allison Henderson
2021-02-24 18:43 ` Brian Foster
2021-02-25 6:20 ` Allison Henderson
2021-03-01 18:20 ` Darrick J. Wong
2021-03-02 8:26 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 11/22] xfs: Add delay ready attr remove routines Allison Henderson
2021-02-24 18:45 ` Brian Foster
2021-02-25 7:01 ` Allison Henderson
2021-02-25 14:22 ` Brian Foster
2021-02-25 22:28 ` Allison Henderson
2021-02-28 15:39 ` Brian Foster
2021-03-02 8:26 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 12/22] xfs: Add delay ready attr set routines Allison Henderson
2021-03-02 1:39 ` Darrick J. Wong
2021-02-18 16:53 ` [PATCH v15 13/22] xfs: Add state machine tracepoints Allison Henderson
2021-02-26 5:06 ` Darrick J. Wong
2021-02-27 0:57 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 14/22] xfs: Rename __xfs_attr_rmtval_remove Allison Henderson
2021-02-18 16:53 ` [PATCH v15 15/22] xfs: Handle krealloc errors in xlog_recover_add_to_cont_trans Allison Henderson
2021-02-26 5:06 ` Darrick J. Wong
2021-02-27 0:57 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 16/22] xfs: Set up infastructure for deferred attribute operations Allison Henderson
2021-02-26 4:58 ` Darrick J. Wong
2021-02-27 0:56 ` Allison Henderson
2021-03-02 7:13 ` Allison Henderson
2021-03-03 11:50 ` Brian Foster
2021-02-18 16:53 ` [PATCH v15 17/22] xfs: Skip flip flags for delayed attrs Allison Henderson
2021-02-26 5:02 ` Darrick J. Wong
2021-02-27 0:56 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 18/22] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-02-26 5:00 ` Darrick J. Wong
2021-02-27 0:57 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 19/22] xfs: Remove unused xfs_attr_*_args Allison Henderson
2021-02-26 4:58 ` Darrick J. Wong
2021-02-27 0:57 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 20/22] xfs: Add delayed attributes error tag Allison Henderson
2021-02-18 16:53 ` [PATCH v15 21/22] xfs: Add delattr mount option Allison Henderson
2021-02-26 4:29 ` Darrick J. Wong
2021-02-27 0:55 ` Allison Henderson
2021-02-18 16:53 ` [PATCH v15 22/22] xfs: Merge xfs_delattr_context into xfs_attr_item 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=fe145942-77fa-bec7-2e79-d420c3202a98@oracle.com \
--to=allison.henderson@oracle.com \
--cc=djwong@kernel.org \
--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).