Commit 508b549a authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Long Li
Browse files

xfs: fix incorrect error-out in xfs_remove 

mainline inclusion
from mainline-v6.1-rc4
commit 2653d533
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4KIAO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2653d53345bda90604f673bb211dd060a5a5c232



--------------------------------

Clean up resources if resetting the dotdot entry doesn't succeed.
Observed through code inspection.

Fixes: 5838d035 ("xfs: reset child dir '..' entry when unlinking child")
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarAndrey Albershteyn <aalbersh@redhat.com>
Signed-off-by: default avatarGuo Xuenan <guoxuenan@huawei.com>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 77566d2b

fs/xfs/xfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2953,7 +2953,7 @@ xfs_remove( 
			error = xfs_dir_replace(tp, ip, &xfs_name_dotdot,

					tp->t_mountp->m_sb.sb_rootino, 0);

			if (error)

				return error;

				goto out_trans_cancel;

		}

	} else {

		/*