From ab53f5a71765cfa8efc4074e01be055124b86eba Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 12 Apr 2023 15:23:34 +0800 Subject: [PATCH] xfs: delete unnecessary NULL checks mainline inclusion from mainline-v5.19-rc5 commit 3f52e016af600982989b5dee958d313c52483c92 category: bugfix bugzilla: 187164, https://gitee.com/openeuler/kernel/issues/I4KIAO CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3f52e016af600982989b5dee958d313c52483c92 -------------------------------- These NULL check are no long needed after commit 2ed5b09b3e8f ("xfs: make inode attribute forks a permanent part of struct xfs_inode"). Signed-off-by: Dan Carpenter Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Long Li Reviewed-by: Zhang Yi Signed-off-by: Jialin Zhang --- fs/xfs/libxfs/xfs_inode_fork.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c index 53b1b2547f6b..520448e5025d 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.c +++ b/fs/xfs/libxfs/xfs_inode_fork.c @@ -739,8 +739,7 @@ xfs_ifork_verify_local_attr( if (fa) { xfs_inode_verifier_error(ip, -EFSCORRUPTED, "attr fork", - ifp ? ifp->if_u1.if_data : NULL, - ifp ? ifp->if_bytes : 0, fa); + ifp->if_u1.if_data, ifp->if_bytes, fa); return -EFSCORRUPTED; } -- GitLab