On Wed, May 18, 2022 at 11:55:49AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@xxxxxxxxxx> > > The calling conventions of this function are a mess -- callers /can/ > provide a pointer to a pointer to a state structure, but it's not > required, and as evidenced by the last two patches, the callers that do > weren't be careful enough about how to deal with an existing da state. > > Push the allocation and freeing responsibilty to the callers, which > means that callers from the xattr node state machine steps now have the > visibility to allocate or free the da state structure as they please. > As a bonus, the node remove/add paths for larp-mode replaces can reset > the da state structure instead of freeing and immediately reallocating > it. > > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> > Reviewed-by: Allison Henderson <allison.henderson@xxxxxxxxxx> > --- > fs/xfs/libxfs/xfs_attr.c | 63 +++++++++++++++++++++--------------------- > fs/xfs/libxfs/xfs_da_btree.c | 11 +++++++ > fs/xfs/libxfs/xfs_da_btree.h | 1 + > 3 files changed, 44 insertions(+), 31 deletions(-) > > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index 576de34cfca0..3838109ef288 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -61,8 +61,8 @@ STATIC void xfs_attr_restore_rmt_blk(struct xfs_da_args *args); > static int xfs_attr_node_try_addname(struct xfs_attr_item *attr); > STATIC int xfs_attr_node_addname_find_attr(struct xfs_attr_item *attr); > STATIC int xfs_attr_node_remove_attr(struct xfs_attr_item *attr); > -STATIC int xfs_attr_node_hasname(xfs_da_args_t *args, > - struct xfs_da_state **state); > +STATIC int xfs_attr_node_lookup(struct xfs_da_args *args, > + struct xfs_da_state *state); > > int > xfs_inode_hasattr( > @@ -594,6 +594,19 @@ xfs_attr_leaf_mark_incomplete( > return xfs_attr3_leaf_setflag(args); > } > > +/* Ensure the da state of an xattr deferred work item is ready to go. */ > +static inline void > +xfs_attr_item_ensure_da_state( xfs_attr_item_init_da_state(). Other than that, it's a nice cleanup. I can rename the function locally if you want. Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx> -- Dave Chinner david@xxxxxxxxxxxxx
