summaryrefslogtreecommitdiffstats
path: root/fs/xfs/libxfs/xfs_inode_buf.c
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2022-07-09 10:56:06 -0700
committerDarrick J. Wong <djwong@kernel.org>2022-07-09 15:17:21 -0700
commite45d7cb2356e6b59fe64da28324025cc6fcd3fbd (patch)
tree19d84f0fc674b316e04ed33854262623c42fa4cc /fs/xfs/libxfs/xfs_inode_buf.c
parent2ed5b09b3e8fc274ae8fecd6ab7c5106a364bed1 (diff)
downloadlinux-stable-e45d7cb2356e6b59fe64da28324025cc6fcd3fbd.tar.gz
linux-stable-e45d7cb2356e6b59fe64da28324025cc6fcd3fbd.tar.bz2
linux-stable-e45d7cb2356e6b59fe64da28324025cc6fcd3fbd.zip
xfs: use XFS_IFORK_Q to determine the presence of an xattr fork
Modify xfs_ifork_ptr to return a NULL pointer if the caller asks for the attribute fork but i_forkoff is zero. This eliminates the ambiguity between i_forkoff and i_af.if_present, which should make it easier to understand the lifetime of attr forks. While we're at it, remove the if_present checks around calls to xfs_idestroy_fork and xfs_ifork_zap_attr since they can both handle attr forks that have already been torn down. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/libxfs/xfs_inode_buf.c')
-rw-r--r--fs/xfs/libxfs/xfs_inode_buf.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index dd11df5d3bf8..2f742a1b7c0a 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -177,7 +177,6 @@ xfs_inode_from_disk(
xfs_failaddr_t fa;
ASSERT(ip->i_cowfp == NULL);
- ASSERT(!ip->i_af.if_present);
fa = xfs_dinode_verify(ip->i_mount, ip->i_ino, from);
if (fa) {