On Mon, Nov 27, 2017 at 04:48:02PM -0600, Eric Sandeen wrote:
> Use _GOTO instead of _RETURN so we can free the allocated
> cursor on error.
>
> Fixes: bf80628 ("xfs: remove xfs_bmse_shift_one")
> Fixes-coverity-id: 1423813
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
Looks ok, will test
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
>
> Compile-tested only
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 08df809..87884aa 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -5662,7 +5662,8 @@ static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork)
> *done = true;
> goto del_cursor;
> }
> - XFS_WANT_CORRUPTED_RETURN(mp, !isnullstartblock(got.br_startblock));
> + XFS_WANT_CORRUPTED_GOTO(mp, !isnullstartblock(got.br_startblock),
> + del_cursor);
>
> new_startoff = got.br_startoff - offset_shift_fsb;
> if (xfs_iext_peek_prev_extent(ifp, &icur, &prev)) {
> @@ -5767,7 +5768,8 @@ static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork)
> goto del_cursor;
> }
> }
> - XFS_WANT_CORRUPTED_RETURN(mp, !isnullstartblock(got.br_startblock));
> + XFS_WANT_CORRUPTED_GOTO(mp, !isnullstartblock(got.br_startblock),
> + del_cursor);
>
> if (stop_fsb >= got.br_startoff + got.br_blockcount) {
> error = -EIO;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
