xfs: fix xfs_ifree() error handling to not leak perag ref
authorBrian Foster <bfoster@redhat.com>
Mon, 30 May 2022 00:56:33 +0000 (10:56 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 30 May 2022 00:56:33 +0000 (10:56 +1000)
For some reason commit 9a5280b312e2e ("xfs: reorder iunlink remove
operation in xfs_ifree") replaced a jump to the exit path in the
event of an xfs_difree() error with a direct return, which skips
releasing the perag reference acquired at the top of the function.
Restore the original code to drop the reference on error.

Fixes: 9a5280b312e2e ("xfs: reorder iunlink remove operation in xfs_ifree")
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_inode.c

index b287987..52d6f2c 100644 (file)
@@ -2622,7 +2622,7 @@ xfs_ifree(
         */
        error = xfs_difree(tp, pag, ip->i_ino, &xic);
        if (error)
-               return error;
+               goto out;
 
        error = xfs_iunlink_remove(tp, pag, ip);
        if (error)