system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-06 19:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: use helpers to extract xattr op from opflags

Browse source 
Create helper functions to extract the xattr op from the ondisk xattri
log item and the incore attr intent item.  These will get more use in
the patches that follow.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2024-04-22 09:47:29 -07:00
parent 992c3b5c3f
commit 2a2c05d013
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/xfs/libxfs/xfs_attr.h
View file

@ -529,6 +529,11 @@ struct xfs_attr_intent {
struct xfs_bmbt_irec xattri_map; struct xfs_bmbt_irec xattri_map;
}; };
static inline unsigned int
xfs_attr_intent_op(const struct xfs_attr_intent *attr)
{
return attr->xattri_op_flags & XFS_ATTRI_OP_FLAGS_TYPE_MASK;
}
/*======================================================================== /*========================================================================
* Function prototypes for the kernel. * Function prototypes for the kernel.

16
fs/xfs/xfs_attr_item.c
View file

@ -308,6 +308,12 @@ xfs_attrd_item_intent(
return &ATTRD_ITEM(lip)->attrd_attrip->attri_item; return &ATTRD_ITEM(lip)->attrd_attrip->attri_item;
} }
static inline unsigned int
xfs_attr_log_item_op(const struct xfs_attri_log_format *attrp)
{
return attrp->alfi_op_flags & XFS_ATTRI_OP_FLAGS_TYPE_MASK;
}
/* Log an attr to the intent item. */ /* Log an attr to the intent item. */
STATIC void STATIC void
xfs_attr_log_item( xfs_attr_log_item(
@ -466,8 +472,7 @@ xfs_attri_validate(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_attri_log_format *attrp) struct xfs_attri_log_format *attrp)
{ {
unsigned int op = attrp->alfi_op_flags & unsigned int op = xfs_attr_log_item_op(attrp);
XFS_ATTRI_OP_FLAGS_TYPE_MASK;
if (!xfs_is_using_logged_xattrs(mp)) if (!xfs_is_using_logged_xattrs(mp))
return false; return false;
@ -551,8 +556,7 @@ xfs_attri_recover_work(
args = (struct xfs_da_args *)(attr + 1); args = (struct xfs_da_args *)(attr + 1);
attr->xattri_da_args = args; attr->xattri_da_args = args;
attr->xattri_op_flags = attrp->alfi_op_flags & attr->xattri_op_flags = xfs_attr_log_item_op(attrp);
XFS_ATTRI_OP_FLAGS_TYPE_MASK;
/* /*
* We're reconstructing the deferred work state structure from the * We're reconstructing the deferred work state structure from the
@ -573,7 +577,7 @@ xfs_attri_recover_work(
XFS_DA_OP_LOGGED; XFS_DA_OP_LOGGED;
args->owner = args->dp->i_ino; args->owner = args->dp->i_ino;
switch (attr->xattri_op_flags) { switch (xfs_attr_intent_op(attr)) {
case XFS_ATTRI_OP_FLAGS_SET: case XFS_ATTRI_OP_FLAGS_SET:
case XFS_ATTRI_OP_FLAGS_REPLACE: case XFS_ATTRI_OP_FLAGS_REPLACE:
args->value = nv->value.i_addr; args->value = nv->value.i_addr;
@ -757,7 +761,7 @@ xlog_recover_attri_commit_pass2(
} }
/* Check the number of log iovecs makes sense for the op code. */ /* Check the number of log iovecs makes sense for the op code. */
op = attri_formatp->alfi_op_flags & XFS_ATTRI_OP_FLAGS_TYPE_MASK; op = xfs_attr_log_item_op(attri_formatp);
switch (op) { switch (op) {
case XFS_ATTRI_OP_FLAGS_SET: case XFS_ATTRI_OP_FLAGS_SET:
case XFS_ATTRI_OP_FLAGS_REPLACE: case XFS_ATTRI_OP_FLAGS_REPLACE: