From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, Dave Chinner <david@fromorbit.com>
Subject: Re: [PATCH 01/11] xfs: cleanup error handling in xfs_buf_get_map
Date: Thu, 20 May 2021 16:43:38 -0700 [thread overview]
Message-ID: <20210520234338.GD9675@magnolia> (raw)
In-Reply-To: <20210519190900.320044-2-hch@lst.de>
On Wed, May 19, 2021 at 09:08:50PM +0200, Christoph Hellwig wrote:
> Use a single goto label for freeing the buffer and returning an error.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_buf.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 592800c8852f45..80be0333f077c0 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -721,16 +721,12 @@ xfs_buf_get_map(
> return error;
>
> error = xfs_buf_allocate_memory(new_bp, flags);
> - if (error) {
> - xfs_buf_free(new_bp);
> - return error;
> - }
> + if (error)
> + goto out_free_buf;
>
> error = xfs_buf_find(target, map, nmaps, flags, new_bp, &bp);
> - if (error) {
> - xfs_buf_free(new_bp);
> - return error;
> - }
> + if (error)
> + goto out_free_buf;
>
> if (bp != new_bp)
> xfs_buf_free(new_bp);
> @@ -758,6 +754,9 @@ xfs_buf_get_map(
> trace_xfs_buf_get(bp, flags, _RET_IP_);
> *bpp = bp;
> return 0;
> +out_free_buf:
> + xfs_buf_free(new_bp);
> + return error;
> }
>
> int
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-05-20 23:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 19:08 RFC: buffer cache backing page allocation cleanup Christoph Hellwig
2021-05-19 19:08 ` [PATCH 01/11] xfs: cleanup error handling in xfs_buf_get_map Christoph Hellwig
2021-05-20 23:43 ` Darrick J. Wong [this message]
2021-05-19 19:08 ` [PATCH 02/11] xfs: split xfs_buf_allocate_memory Christoph Hellwig
2021-05-19 22:36 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 03/11] xfs: remove ->b_offset handling for page backed buffers Christoph Hellwig
2021-05-19 22:27 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 04/11] xfs: cleanup _xfs_buf_get_pages Christoph Hellwig
2021-05-19 22:40 ` Dave Chinner
2021-05-20 5:23 ` Christoph Hellwig
2021-05-25 22:43 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 05/11] xfs: remove the xb_page_found stat counter in xfs_buf_alloc_pages Christoph Hellwig
2021-05-19 22:55 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 06/11] xfs: remove the size and nbytes variables " Christoph Hellwig
2021-05-19 22:56 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 07/11] xfs: simplify the b_page_count calculation Christoph Hellwig
2021-05-19 19:08 ` [PATCH 08/11] xfs: centralize page allocation and freeing for buffers Christoph Hellwig
2021-05-19 23:22 ` Dave Chinner
2021-05-20 5:35 ` Christoph Hellwig
2021-05-25 23:59 ` Dave Chinner
2021-05-19 19:08 ` [PATCH 09/11] xfs: lift the buffer zeroing logic into xfs_buf_alloc_pages Christoph Hellwig
2021-05-19 19:08 ` [PATCH 10/11] xfs: retry allocations from xfs_buf_get_uncached as well Christoph Hellwig
2021-05-19 19:09 ` [PATCH 11/11] xfs: use alloc_pages_bulk_array() for buffers Christoph Hellwig
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=20210520234338.GD9675@magnolia \
--to=djwong@kernel.org \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.