Commit e3c5de22 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

xfs: rename struct xfs_attr_item to xfs_attr_intent 



Everywhere else in XFS, structures that capture the state of an ongoing
deferred work item all have names that end with "_intent".  The new
extended attribute deferred work items are not named as such, so fix it
to follow the naming convention used elsewhere.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 3768f698

fs/xfs/libxfs/xfs_attr.c

+26 −26
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ STATIC int xfs_attr_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp); 
 */

STATIC int xfs_attr_node_get(xfs_da_args_t *args);

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_try_addname(struct xfs_attr_intent *attr);

STATIC int xfs_attr_node_addname_find_attr(struct xfs_attr_intent *attr);

STATIC int xfs_attr_node_remove_attr(struct xfs_attr_intent *attr);

STATIC int xfs_attr_node_lookup(struct xfs_da_args *args,

		struct xfs_da_state *state);
@@ -376,7 +376,7 @@ xfs_attr_try_sf_addname( 


static int

xfs_attr_sf_addname(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	struct xfs_inode		*dp = args->dp;
@@ -422,7 +422,7 @@ xfs_attr_sf_addname( 
 */

static enum xfs_delattr_state

xfs_attr_complete_op(

	struct xfs_attr_item	*attr,

	struct xfs_attr_intent	*attr,

	enum xfs_delattr_state	replace_state)

{

	struct xfs_da_args	*args = attr->xattri_da_args;
@@ -438,7 +438,7 @@ xfs_attr_complete_op( 


static int

xfs_attr_leaf_addname(

	struct xfs_attr_item	*attr)

	struct xfs_attr_intent	*attr)

{

	struct xfs_da_args	*args = attr->xattri_da_args;

	int			error;
@@ -492,7 +492,7 @@ xfs_attr_leaf_addname( 
 */

static int

xfs_attr_node_addname(

	struct xfs_attr_item	*attr)

	struct xfs_attr_intent	*attr)

{

	struct xfs_da_args	*args = attr->xattri_da_args;

	int			error;
@@ -529,7 +529,7 @@ xfs_attr_node_addname( 


static int

xfs_attr_rmtval_alloc(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args              *args = attr->xattri_da_args;

	int				error = 0;
@@ -596,7 +596,7 @@ xfs_attr_leaf_mark_incomplete( 
/* Ensure the da state of an xattr deferred work item is ready to go. */

static inline void

xfs_attr_item_init_da_state(

	struct xfs_attr_item	*attr)

	struct xfs_attr_intent	*attr)

{

	struct xfs_da_args	*args = attr->xattri_da_args;
@@ -613,7 +613,7 @@ xfs_attr_item_init_da_state( 
 */

static

int xfs_attr_node_removename_setup(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	struct xfs_da_state		*state;
@@ -651,7 +651,7 @@ int xfs_attr_node_removename_setup( 
 */

static int

xfs_attr_leaf_remove_attr(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args              *args = attr->xattri_da_args;

	struct xfs_inode		*dp = args->dp;
@@ -716,7 +716,7 @@ xfs_attr_leaf_shrink( 
 */

int

xfs_attr_set_iter(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args              *args = attr->xattri_da_args;

	int				error = 0;
@@ -893,13 +893,13 @@ xfs_attr_lookup( 
}



static int

xfs_attr_item_init(

xfs_attr_intent_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_intent	**attr)		/* new xfs_attr_intent */

{



	struct xfs_attr_item	*new;

	struct xfs_attr_intent	*new;



	new = kmem_cache_zalloc(xfs_attr_intent_cache, GFP_NOFS | __GFP_NOFAIL);

	new->xattri_op_flags = op_flags;
@@ -914,10 +914,10 @@ static int 
xfs_attr_defer_add(

	struct xfs_da_args	*args)

{

	struct xfs_attr_item	*new;

	struct xfs_attr_intent	*new;

	int			error = 0;



	error = xfs_attr_item_init(args, XFS_ATTRI_OP_FLAGS_SET, &new);

	error = xfs_attr_intent_init(args, XFS_ATTRI_OP_FLAGS_SET, &new);

	if (error)

		return error;
@@ -933,10 +933,10 @@ static int 
xfs_attr_defer_replace(

	struct xfs_da_args	*args)

{

	struct xfs_attr_item	*new;

	struct xfs_attr_intent	*new;

	int			error = 0;



	error = xfs_attr_item_init(args, XFS_ATTRI_OP_FLAGS_REPLACE, &new);

	error = xfs_attr_intent_init(args, XFS_ATTRI_OP_FLAGS_REPLACE, &new);

	if (error)

		return error;
@@ -953,10 +953,10 @@ xfs_attr_defer_remove( 
	struct xfs_da_args	*args)

{



	struct xfs_attr_item	*new;

	struct xfs_attr_intent	*new;

	int			error;



	error  = xfs_attr_item_init(args, XFS_ATTRI_OP_FLAGS_REMOVE, &new);

	error  = xfs_attr_intent_init(args, XFS_ATTRI_OP_FLAGS_REMOVE, &new);

	if (error)

		return error;
@@ -1394,7 +1394,7 @@ xfs_attr_node_lookup( 


STATIC int

xfs_attr_node_addname_find_attr(

	 struct xfs_attr_item	*attr)

	 struct xfs_attr_intent	*attr)

{

	struct xfs_da_args	*args = attr->xattri_da_args;

	int			error;
@@ -1447,7 +1447,7 @@ xfs_attr_node_addname_find_attr( 
 */

static int

xfs_attr_node_try_addname(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	struct xfs_da_state		*state = attr->xattri_da_state;
@@ -1513,7 +1513,7 @@ xfs_attr_node_removename( 


static int

xfs_attr_node_remove_attr(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	struct xfs_da_state		*state = xfs_da_state_alloc(args);
@@ -1616,8 +1616,8 @@ xfs_attr_namecheck( 
int __init

xfs_attr_intent_init_cache(void)

{

	xfs_attr_intent_cache = kmem_cache_create("xfs_attr_item",

			sizeof(struct xfs_attr_item),

	xfs_attr_intent_cache = kmem_cache_create("xfs_attr_intent",

			sizeof(struct xfs_attr_intent),

			0, 0, NULL);



	return xfs_attr_intent_cache != NULL ? 0 : -ENOMEM;

fs/xfs/libxfs/xfs_attr.h

+4 −4
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ struct xfs_attr_list_context { 
 */



/*

 * Enum values for xfs_attr_item.xattri_da_state

 * Enum values for xfs_attr_intent.xattri_da_state

 *

 * These values are used by delayed attribute operations to keep track  of where

 * they were before they returned -EAGAIN.  A return code of -EAGAIN signals the
@@ -504,7 +504,7 @@ enum xfs_delattr_state { 
/*

 * Context used for keeping track of delayed attribute operations

 */

struct xfs_attr_item {

struct xfs_attr_intent {

	/*

	 * used to log this item to an intent containing a list of attrs to

	 * commit later
@@ -551,8 +551,8 @@ bool xfs_attr_is_leaf(struct xfs_inode *ip); 
int xfs_attr_get_ilocked(struct xfs_da_args *args);

int xfs_attr_get(struct xfs_da_args *args);

int xfs_attr_set(struct xfs_da_args *args);

int xfs_attr_set_iter(struct xfs_attr_item *attr);

int xfs_attr_remove_iter(struct xfs_attr_item *attr);

int xfs_attr_set_iter(struct xfs_attr_intent *attr);

int xfs_attr_remove_iter(struct xfs_attr_intent *attr);

bool xfs_attr_namecheck(const void *name, size_t length);

int xfs_attr_calc_size(struct xfs_da_args *args, int *local);

void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres,

fs/xfs/libxfs/xfs_attr_remote.c

+3 −3
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ xfs_attr_rmtval_stale( 
 */

int

xfs_attr_rmtval_find_space(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	struct xfs_bmbt_irec		*map = &attr->xattri_map;
@@ -598,7 +598,7 @@ xfs_attr_rmtval_find_space( 
 */

int

xfs_attr_rmtval_set_blk(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	struct xfs_inode		*dp = args->dp;
@@ -674,7 +674,7 @@ xfs_attr_rmtval_invalidate( 
 */

int

xfs_attr_rmtval_remove(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	int				error, done;

fs/xfs/libxfs/xfs_attr_remote.h

+3 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ int xfs_attr_rmtval_get(struct xfs_da_args *args); 
int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,

		xfs_buf_flags_t incore_flags);

int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);

int xfs_attr_rmtval_remove(struct xfs_attr_item *attr);

int xfs_attr_rmtval_remove(struct xfs_attr_intent *attr);

int xfs_attr_rmt_find_hole(struct xfs_da_args *args);

int xfs_attr_rmtval_set_value(struct xfs_da_args *args);

int xfs_attr_rmtval_set_blk(struct xfs_attr_item *attr);

int xfs_attr_rmtval_find_space(struct xfs_attr_item *attr);

int xfs_attr_rmtval_set_blk(struct xfs_attr_intent *attr);

int xfs_attr_rmtval_find_space(struct xfs_attr_intent *attr);

#endif /* __XFS_ATTR_REMOTE_H__ */

fs/xfs/xfs_attr_item.c

+12 −12
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ xfs_attrd_item_intent( 
 */

STATIC int

xfs_xattri_finish_update(

	struct xfs_attr_item		*attr,

	struct xfs_attr_intent		*attr,

	struct xfs_attrd_log_item	*attrdp)

{

	struct xfs_da_args		*args = attr->xattri_da_args;
@@ -338,7 +338,7 @@ STATIC void 
xfs_attr_log_item(

	struct xfs_trans		*tp,

	struct xfs_attri_log_item	*attrip,

	struct xfs_attr_item		*attr)

	const struct xfs_attr_intent	*attr)

{

	struct xfs_attri_log_format	*attrp;
@@ -346,9 +346,9 @@ xfs_attr_log_item( 
	set_bit(XFS_LI_DIRTY, &attrip->attri_item.li_flags);



	/*

	 * At this point the xfs_attr_item has been constructed, and we've

	 * At this point the xfs_attr_intent has been constructed, and we've

	 * created the log intent. Fill in the attri log item and log format

	 * structure with fields from this xfs_attr_item

	 * structure with fields from this xfs_attr_intent

	 */

	attrp = &attrip->attri_format;

	attrp->alfi_ino = attr->xattri_da_args->dp->i_ino;
@@ -377,7 +377,7 @@ xfs_attr_create_intent( 
{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_attri_log_item	*attrip;

	struct xfs_attr_item		*attr;

	struct xfs_attr_intent		*attr;



	ASSERT(count == 1);
@@ -403,7 +403,7 @@ xfs_attr_create_intent( 


static inline void

xfs_attr_free_item(

	struct xfs_attr_item		*attr)

	struct xfs_attr_intent		*attr)

{

	if (attr->xattri_da_state)

		xfs_da_state_free(attr->xattri_da_state);
@@ -421,11 +421,11 @@ xfs_attr_finish_item( 
	struct list_head		*item,

	struct xfs_btree_cur		**state)

{

	struct xfs_attr_item		*attr;

	struct xfs_attr_intent		*attr;

	struct xfs_attrd_log_item	*done_item = NULL;

	int				error;



	attr = container_of(item, struct xfs_attr_item, xattri_list);

	attr = container_of(item, struct xfs_attr_intent, xattri_list);

	if (done)

		done_item = ATTRD_ITEM(done);
@@ -455,9 +455,9 @@ STATIC void 
xfs_attr_cancel_item(

	struct list_head		*item)

{

	struct xfs_attr_item		*attr;

	struct xfs_attr_intent		*attr;



	attr = container_of(item, struct xfs_attr_item, xattri_list);

	attr = container_of(item, struct xfs_attr_intent, xattri_list);

	xfs_attr_free_item(attr);

}
@@ -540,7 +540,7 @@ xfs_attri_item_recover( 
	struct list_head		*capture_list)

{

	struct xfs_attri_log_item	*attrip = ATTRI_ITEM(lip);

	struct xfs_attr_item		*attr;

	struct xfs_attr_intent		*attr;

	struct xfs_mount		*mp = lip->li_log->l_mp;

	struct xfs_inode		*ip;

	struct xfs_da_args		*args;
@@ -565,7 +565,7 @@ xfs_attri_item_recover( 
	if (error)

		return error;



	attr = kmem_zalloc(sizeof(struct xfs_attr_item) +

	attr = kmem_zalloc(sizeof(struct xfs_attr_intent) +

			   sizeof(struct xfs_da_args), KM_NOFS);

	args = (struct xfs_da_args *)(attr + 1);