From: Chandan Babu R <chandanrlinux@gmail.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v16 07/11] xfs: Hoist xfs_attr_node_addname
Date: Fri, 02 Apr 2021 09:56:09 +0530 [thread overview]
Message-ID: <87sg4971ni.fsf@garuda> (raw)
In-Reply-To: <20210326003308.32753-8-allison.henderson@oracle.com>
On 26 Mar 2021 at 06:03, Allison Henderson wrote:
> This patch hoists the later half of xfs_attr_node_addname into
> the calling function. We do this because it is this area that
> will need the most state management, and we want to keep such
> code in the same scope as much as possible
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> Reviewed-by: Brian Foster <bfoster@redhat.com>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> ---
> fs/xfs/libxfs/xfs_attr.c | 161 +++++++++++++++++++++++------------------------
> 1 file changed, 78 insertions(+), 83 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 16159f6..5b5410f 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -52,6 +52,7 @@ STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp);
> * Internal routines when attribute list is more than one block.
> */
> STATIC int xfs_attr_node_get(xfs_da_args_t *args);
> +STATIC void xfs_attr_restore_rmt_blk(struct xfs_da_args *args);
> STATIC int xfs_attr_node_addname(struct xfs_da_args *args,
> struct xfs_da_state *state);
> STATIC int xfs_attr_node_addname_find_attr(struct xfs_da_args *args,
> @@ -270,8 +271,8 @@ xfs_attr_set_args(
> struct xfs_da_args *args)
> {
> struct xfs_inode *dp = args->dp;
> - struct xfs_da_state *state;
> - int error;
> + struct xfs_da_state *state = NULL;
> + int error = 0;
>
> /*
> * If the attribute list is already in leaf format, jump straight to
> @@ -322,8 +323,79 @@ xfs_attr_set_args(
> return error;
> error = xfs_attr_node_addname(args, state);
> } while (error == -EAGAIN);
> + if (error)
> + return error;
Memory pointed to by 'state' is leaked if the call to either xfs_da3_split()
or xfs_defer_finish() inside xfs_attr_node_addname() return an error.
--
chandan
next prev parent reply other threads:[~2021-04-02 4:26 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
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 [this message]
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=87sg4971ni.fsf@garuda \
--to=chandanrlinux@gmail.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).