From 6f5097e3367a7c0751e165e4c15bc30511a4ba38 Mon Sep 17 00:00:00 2001

From: Brian Foster <bfoster@redhat.com>

Date: Mon, 30 May 2022 10:56:33 +1000

Subject: [PATCH] xfs: fix xfs_ifree() error handling to not leak perag ref

Git-commit: 6f5097e3367a7c0751e165e4c15bc30511a4ba38

Patch-mainline: v5.19-rc1

References: git-fixes

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>

Acked-by: Anthony Iliopoulos <ailiop@suse.com>

---

 fs/xfs/xfs_inode.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c

index b2879870a17e..52d6f2c7d58b 100644

--- a/fs/xfs/xfs_inode.c

+++ b/fs/xfs/xfs_inode.c

@@ -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)

-- 

2.35.3