On Thu, May 27, 2021 at 08:47:21AM +1000, Dave Chinner wrote:
> From: Christoph Hellwig <hch@xxxxxx>
>
> Use a single goto label for freeing the buffer and returning an
> error.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Straightforward refactoring.
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--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 701a798db7b7..f56a76f8a653 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -689,16 +689,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);
> @@ -726,6 +722,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.31.1
>
