From: Brian Foster <bfoster@redhat.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v16 01/11] xfs: Reverse apply 72b97ea40d
Date: Thu, 1 Apr 2021 11:43:13 -0400 [thread overview]
Message-ID: <YGXqEdJfzhES/xDz@bfoster> (raw)
In-Reply-To: <20210326003308.32753-2-allison.henderson@oracle.com>
On Thu, Mar 25, 2021 at 05:32:58PM -0700, Allison Henderson wrote:
> Originally we added this patch to help modularize the attr code in
> preparation for delayed attributes and the state machine it requires.
> However, later reviews found that this slightly alters the transaction
> handling as the helper function is ambiguous as to whether the
> transaction is diry or clean. This may cause a dirty transaction to be
> included in the next roll, where previously it had not. To preserve the
> existing code flow, we reverse apply this commit.
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_attr.c | 28 +++++++++-------------------
> 1 file changed, 9 insertions(+), 19 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 472b303..b42144e 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -1202,24 +1202,6 @@ int xfs_attr_node_removename_setup(
> return 0;
> }
>
> -STATIC int
> -xfs_attr_node_remove_rmt(
> - struct xfs_da_args *args,
> - struct xfs_da_state *state)
> -{
> - int error = 0;
> -
> - error = xfs_attr_rmtval_remove(args);
> - if (error)
> - return error;
> -
> - /*
> - * Refill the state structure with buffers, the prior calls released our
> - * buffers.
> - */
> - return xfs_attr_refillstate(state);
> -}
> -
> /*
> * Remove a name from a B-tree attribute list.
> *
> @@ -1248,7 +1230,15 @@ xfs_attr_node_removename(
> * overflow the maximum size of a transaction and/or hit a deadlock.
> */
> if (args->rmtblkno > 0) {
> - error = xfs_attr_node_remove_rmt(args, state);
> + error = xfs_attr_rmtval_remove(args);
> + if (error)
> + goto out;
> +
> + /*
> + * Refill the state structure with buffers, the prior calls
> + * released our buffers.
> + */
> + error = xfs_attr_refillstate(state);
> if (error)
> goto out;
> }
> --
> 2.7.4
>
next prev parent reply other threads:[~2021-04-01 17:53 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 0:32 [PATCH v16 00/11] xfs: Delay Ready Attributes Allison Henderson
2021-03-26 0:32 ` [PATCH v16 01/11] xfs: Reverse apply 72b97ea40d Allison Henderson
2021-03-29 8:44 ` Chandan Babu R
2021-04-02 9:47 ` Allison Henderson
2021-04-01 15:43 ` Brian Foster [this message]
2021-04-02 9:49 ` Allison Henderson
2021-03-26 0:32 ` [PATCH v16 02/11] xfs: Add xfs_attr_node_remove_cleanup Allison Henderson
2021-03-26 0:33 ` [PATCH v16 03/11] xfs: Hoist xfs_attr_set_shortform Allison Henderson
2021-03-29 9:21 ` Chandan Babu R
2021-04-02 9:47 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 04/11] xfs: Add helper xfs_attr_set_fmt Allison Henderson
2021-03-29 9:37 ` Chandan Babu R
2021-04-02 9:47 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 05/11] xfs: Separate xfs_attr_node_addname and xfs_attr_node_addname_clear_incomplete Allison Henderson
2021-03-29 14:42 ` Chandan Babu R
2021-04-02 9:00 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 06/11] xfs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-04-02 4:05 ` Chandan Babu R
2021-04-02 9:50 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 07/11] xfs: Hoist xfs_attr_node_addname Allison Henderson
2021-04-02 4:26 ` Chandan Babu R
2021-04-02 9:01 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 08/11] xfs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-04-01 15:43 ` Brian Foster
2021-04-02 9:01 ` Allison Henderson
2021-04-05 13:15 ` Brian Foster
2021-04-02 4:40 ` Chandan Babu R
2021-04-02 9:50 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 09/11] xfs: Hoist node transaction handling Allison Henderson
2021-04-02 5:04 ` Chandan Babu R
2021-04-02 9:51 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 10/11] xfs: Add delay ready attr remove routines Allison Henderson
2021-04-01 16:55 ` Brian Foster
2021-04-02 9:42 ` Allison Henderson
2021-04-05 13:15 ` Brian Foster
2021-04-02 7:59 ` Chandan Babu R
2021-04-02 9:45 ` Allison Henderson
2021-03-26 0:33 ` [PATCH v16 11/11] xfs: Add delay ready attr set routines Allison Henderson
2021-04-01 16:57 ` Brian Foster
2021-04-02 9:01 ` Allison Henderson
2021-04-05 13:17 ` Brian Foster
2021-04-14 18:14 ` Allison Henderson
2021-03-29 21:59 ` [PATCH v16 00/11] xfs: Delay Ready Attributes Darrick J. Wong
2021-04-02 9:49 ` 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=YGXqEdJfzhES/xDz@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).