leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: use XFS_IFORK_Q to determine the presence of an xattr fork

Browse Source 
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>
This commit is contained in:
Darrick J. Wong 2022-07-09 10:56:06 -07:00
parent 2ed5b09b3e
commit e45d7cb235
11 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/libxfs/xfs_attr.c
View File

@ -69,8 +69,6 @@ xfs_inode_hasattr(
{
if (!XFS_IFORK_Q(ip))
return 0;
if (!ip->i_af.if_present)
return 0;
if (ip->i_af.if_format == XFS_DINODE_FMT_EXTENTS &&
ip->i_af.if_nextents == 0)
return 0;

2
fs/xfs/libxfs/xfs_attr.h
View File

@ -576,7 +576,7 @@ xfs_attr_init_add_state(struct xfs_da_args *args)
* context, i_af is guaranteed to exist. Hence if the attr fork is
* null, we were called from a pure remove operation and so we are done.
*/
if (!args->dp->i_af.if_present)
if (!XFS_IFORK_Q(args->dp))
return XFS_DAS_DONE;
args->op_flags |= XFS_DA_OP_ADDNAME;

1
fs/xfs/libxfs/xfs_bmap.c
View File

@ -1041,7 +1041,6 @@ xfs_bmap_add_attrfork(
error = xfs_bmap_set_attrforkoff(ip, size, &version);
if (error)
goto trans_cancel;
ASSERT(!ip->i_af.if_present);
xfs_ifork_init_attr(ip, XFS_DINODE_FMT_EXTENTS, 0);
logflags = 0;

1
fs/xfs/libxfs/xfs_inode_buf.c
View File

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

7
fs/xfs/libxfs/xfs_inode_fork.c
View File

@ -282,9 +282,6 @@ xfs_ifork_init_attr(
enum xfs_dinode_fmt format,
xfs_extnum_t nextents)
{
ASSERT(!ip->i_af.if_present);
ip->i_af.if_present = 1;
ip->i_af.if_format = format;
ip->i_af.if_nextents = nextents;
}
@ -293,7 +290,6 @@ void
xfs_ifork_zap_attr(
struct xfs_inode *ip)
{
ASSERT(ip->i_af.if_present);
ASSERT(ip->i_af.if_broot == NULL);
ASSERT(ip->i_af.if_u1.if_data == NULL);
ASSERT(ip->i_af.if_height == 0);
@ -683,7 +679,6 @@ xfs_ifork_init_cow(
ip->i_cowfp = kmem_cache_zalloc(xfs_ifork_cache,
GFP_NOFS | __GFP_NOFAIL);
ip->i_cowfp->if_present = 1;
ip->i_cowfp->if_format = XFS_DINODE_FMT_EXTENTS;
}
@ -722,7 +717,7 @@ xfs_ifork_verify_local_attr(
struct xfs_ifork *ifp = &ip->i_af;
xfs_failaddr_t fa;
if (!ifp->if_present)
if (!XFS_IFORK_Q(ip))
fa = __this_address;
else
fa = xfs_attr_shortform_verify(ip);

1
fs/xfs/libxfs/xfs_inode_fork.h
View File

@ -24,7 +24,6 @@ struct xfs_ifork {
xfs_extnum_t if_nextents; /* # of extents in this fork */
short if_broot_bytes; /* bytes allocated for root */
int8_t if_format; /* format of this fork */
int8_t if_present; /* 1 if present */
};
/*

11
fs/xfs/xfs_attr_inactive.c
View File

@ -362,12 +362,11 @@ xfs_attr_inactive(
/*
* Invalidate and truncate the attribute fork extents. Make sure the
* fork actually has attributes as otherwise the invalidation has no
* fork actually has xattr blocks as otherwise the invalidation has no
* blocks to read and returns an error. In this case, just do the fork
* removal below.
*/
if (xfs_inode_hasattr(dp) &&
dp->i_af.if_format != XFS_DINODE_FMT_LOCAL) {
if (dp->i_af.if_nextents > 0) {
error = xfs_attr3_root_inactive(&trans, dp);
if (error)
goto out_cancel;
@ -388,10 +387,8 @@ out_cancel:
xfs_trans_cancel(trans);
out_destroy_fork:
/* kill the in-core attr fork before we drop the inode lock */
if (dp->i_af.if_present) {
xfs_idestroy_fork(&dp->i_af);
xfs_ifork_zap_attr(dp);
}
xfs_idestroy_fork(&dp->i_af);
xfs_ifork_zap_attr(dp);
if (lock_mode)
xfs_iunlock(dp, lock_mode);
return error;

1
fs/xfs/xfs_attr_list.c
View File

@ -61,7 +61,6 @@ xfs_attr_shortform_list(
int sbsize, nsbuf, count, i;
int error = 0;
ASSERT(dp->i_af.if_present);
sf = (struct xfs_attr_shortform *)dp->i_af.if_u1.if_data;
ASSERT(sf != NULL);
if (!sf->hdr.count)

8
fs/xfs/xfs_icache.c
View File

@ -102,7 +102,6 @@ xfs_inode_alloc(
memset(&ip->i_af, 0, sizeof(ip->i_af));
ip->i_af.if_format = XFS_DINODE_FMT_EXTENTS;
memset(&ip->i_df, 0, sizeof(ip->i_df));
ip->i_df.if_present = 1;
ip->i_flags = 0;
ip->i_delayed_blks = 0;
ip->i_diflags2 = mp->m_ino_geo.new_diflags2;
@ -132,10 +131,9 @@ xfs_inode_free_callback(
break;
}
if (ip->i_af.if_present) {
xfs_idestroy_fork(&ip->i_af);
xfs_ifork_zap_attr(ip);
}
xfs_idestroy_fork(&ip->i_af);
xfs_ifork_zap_attr(ip);
if (ip->i_cowfp) {
xfs_idestroy_fork(ip->i_cowfp);
kmem_cache_free(xfs_ifork_cache, ip->i_cowfp);

5
fs/xfs/xfs_inode.c
View File

@ -125,7 +125,7 @@ xfs_ilock_attr_map_shared(
{
uint lock_mode = XFS_ILOCK_SHARED;
if (ip->i_af.if_present && xfs_need_iread_extents(&ip->i_af))
if (XFS_IFORK_Q(ip) && xfs_need_iread_extents(&ip->i_af))
lock_mode = XFS_ILOCK_EXCL;
xfs_ilock(ip, lock_mode);
return lock_mode;
@ -1768,7 +1768,6 @@ xfs_inactive(
goto out;
}
ASSERT(!ip->i_af.if_present);
ASSERT(ip->i_forkoff == 0);
/*
@ -3502,7 +3501,7 @@ xfs_iflush(
if (ip->i_df.if_format == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_data(ip))
goto flush_out;
if (ip->i_af.if_present &&
if (XFS_IFORK_Q(ip) &&
ip->i_af.if_format == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_attr(ip))
goto flush_out;

2
fs/xfs/xfs_inode.h
View File

@ -86,7 +86,7 @@ xfs_ifork_ptr(
case XFS_DATA_FORK:
return &ip->i_df;
case XFS_ATTR_FORK:
if (!ip->i_af.if_present)
if (!XFS_IFORK_Q(ip))
return NULL;
return &ip->i_af;
case XFS_COW_FORK: