xfs: cleanup xfs_bmse_merge returns

Signed-off-by: Dave Chinner <dchinner@redhat.com>
xfs_bmse_merge() has a jump label for return that just returns the
error value. Convert all the code to just return the error directly
and use XFS_WANT_CORRUPTED_RETURN. This also allows the final call
to xfs_bmbt_update() to return directly.

Noticed while reviewing coccinelle return cleanup patches and
wondering why the same return pattern as in xfs_bmse_shift_one()
wasn't picked up by the checker pattern...

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 0628a678de121e28b5b918976c4fe4e3919fcd4c..5a42e2ba857f673bbf7dc05a2c9cc4f485d1a55e 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5489,32 +5489,25 @@ xfs_bmse_merge(
        error = xfs_bmbt_lookup_eq(cur, got.br_startoff, got.br_startblock,
                                   got.br_blockcount, &i);
        if (error)
-               goto out_error;
-       XFS_WANT_CORRUPTED_GOTO(i == 1, out_error);
+               return error;
+       XFS_WANT_CORRUPTED_RETURN(i == 1);
 
        error = xfs_btree_delete(cur, &i);
        if (error)
-               goto out_error;
-       XFS_WANT_CORRUPTED_GOTO(i == 1, out_error);
+               return error;
+       XFS_WANT_CORRUPTED_RETURN(i == 1);
 
        /* lookup and update size of the previous extent */
        error = xfs_bmbt_lookup_eq(cur, left.br_startoff, left.br_startblock,
                                   left.br_blockcount, &i);
        if (error)
-               goto out_error;
-       XFS_WANT_CORRUPTED_GOTO(i == 1, out_error);
+               return error;
+       XFS_WANT_CORRUPTED_RETURN(i == 1);
 
        left.br_blockcount = blockcount;
 
-       error = xfs_bmbt_update(cur, left.br_startoff, left.br_startblock,
-                               left.br_blockcount, left.br_state);
-       if (error)
-               goto out_error;
-
-       return 0;
-
-out_error:
-       return error;
+       return xfs_bmbt_update(cur, left.br_startoff, left.br_startblock,
+                              left.br_blockcount, left.br_state);
 }
 
 /*