Re: [PATCH v15 18/22] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred

[Allison Henderson <allison.henderson@xxxxxxxxxx>]

On 2/25/21 10:00 PM, Darrick J. Wong wrote:
> On Thu, Feb 18, 2021 at 09:53:44AM -0700, Allison Henderson wrote:
> > From: Allison Collins <allison.henderson@xxxxxxxxxx>
> >
> > These routines to set up and start a new deferred attribute operations.
>
> "These routine set up and queue a new deferred attribute operation..."?
Sure, will fix
> > These functions are meant to be called by any routine needing to
> > initiate a deferred attribute operation as opposed to the existing
> > inline operations. New helper function xfs_attr_item_init also added.
> >
> > Finally enable delayed attributes in xfs_attr_set and xfs_attr_remove.
> >
> > Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
>
> Other than that it seems fine to me,
> Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Thank you!
Allison

> --D
>
> > ---
> >   fs/xfs/libxfs/xfs_attr.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++--
> >   fs/xfs/libxfs/xfs_attr.h |  2 ++
> >   2 files changed, 58 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> > index 666cc69..cec861e 100644
> > --- a/fs/xfs/libxfs/xfs_attr.c
> > +++ b/fs/xfs/libxfs/xfs_attr.c
> > @@ -25,6 +25,7 @@
> >   #include "xfs_trans_space.h"
> >   #include "xfs_trace.h"
> >   #include "xfs_attr_item.h"
> > +#include "xfs_attr.h"
> >   
> >   /*
> >    * xfs_attr.c
> > @@ -838,9 +839,10 @@ xfs_attr_set(
> >   		if (error != -ENOATTR && error != -EEXIST)
> >   			goto out_trans_cancel;
> >   
> > -		error = xfs_attr_set_args(args);
> > +		error = xfs_attr_set_deferred(args);
> >   		if (error)
> >   			goto out_trans_cancel;
> > +
> >   		/* shortform attribute has already been committed */
> >   		if (!args->trans)
> >   			goto out_unlock;
> > @@ -849,7 +851,7 @@ xfs_attr_set(
> >   		if (error != -EEXIST)
> >   			goto out_trans_cancel;
> >   
> > -		error = xfs_attr_remove_args(args);
> > +		error = xfs_attr_remove_deferred(args);
> >   		if (error)
> >   			goto out_trans_cancel;
> >   	}
> > @@ -879,6 +881,58 @@ xfs_attr_set(
> >   	goto out_unlock;
> >   }
> >   
> > +STATIC int
> > +xfs_attr_item_init(
> > +	struct xfs_da_args	*args,
> > +	unsigned int		op_flags,	/* op flag (set or remove) */
> > +	struct xfs_attr_item	**attr)		/* new xfs_attr_item */
> > +{
> > +
> > +	struct xfs_attr_item	*new;
> > +
> > +	new = kmem_zalloc(sizeof(struct xfs_attr_item), KM_NOFS);
> > +	new->xattri_op_flags = op_flags;
> > +	new->xattri_dac.da_args = args;
> > +
> > +	*attr = new;
> > +	return 0;
> > +}
> > +
> > +/* Sets an attribute for an inode as a deferred operation */
> > +int
> > +xfs_attr_set_deferred(
> > +	struct xfs_da_args	*args)
> > +{
> > +	struct xfs_attr_item	*new;
> > +	int			error = 0;
> > +
> > +	error = xfs_attr_item_init(args, XFS_ATTR_OP_FLAGS_SET, &new);
> > +	if (error)
> > +		return error;
> > +
> > +	xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list);
> > +
> > +	return 0;
> > +}
> > +
> > +/* Removes an attribute for an inode as a deferred operation */
> > +int
> > +xfs_attr_remove_deferred(
> > +	struct xfs_da_args	*args)
> > +{
> > +
> > +	struct xfs_attr_item	*new;
> > +	int			error;
> > +
> > +	error  = xfs_attr_item_init(args, XFS_ATTR_OP_FLAGS_REMOVE, &new);
> > +	if (error)
> > +		return error;
> > +
> > +	xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list);
> > +
> > +	return 0;
> > +}
> > +
> >   /*========================================================================
> >    * External routines when attribute list is inside the inode
> >    *========================================================================*/
> > diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> > index ee79763..4abf02c 100644
> > --- a/fs/xfs/libxfs/xfs_attr.h
> > +++ b/fs/xfs/libxfs/xfs_attr.h
> > @@ -462,5 +462,7 @@ bool xfs_attr_namecheck(const void *name, size_t length);
> >   void xfs_delattr_context_init(struct xfs_delattr_context *dac,
> >   			      struct xfs_da_args *args);
> >   int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
> > +int xfs_attr_set_deferred(struct xfs_da_args *args);
> > +int xfs_attr_remove_deferred(struct xfs_da_args *args);
> >   
> >   #endif	/* __XFS_ATTR_H__ */
> > --
> > 2.7.4