Commit 4491a3dd authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong
Browse files

xfs: Refactor xfs_da_state_alloc() helper 



Every call to xfs_da_state_alloc() also requires setting up state->args
and state->mp

Change xfs_da_state_alloc() to receive an xfs_da_args_t as argument and
return a xfs_da_state_t with both args and mp already set.

Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[darrick: reduce struct typedef usage]
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent bae633a4

fs/xfs/libxfs/xfs_attr.c

+5 −14
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ xfs_attr_node_addname( 
	struct xfs_da_state	*state;

	struct xfs_da_state_blk	*blk;

	struct xfs_inode	*dp;

	struct xfs_mount	*mp;

	int			retval, error;



	trace_xfs_attr_node_addname(args);
@@ -748,11 +747,8 @@ xfs_attr_node_addname( 
	 * Fill in bucket of arguments/results/context to carry around.

	 */

	dp = args->dp;

	mp = dp->i_mount;

restart:

	state = xfs_da_state_alloc();

	state->args = args;

	state->mp = mp;

	state = xfs_da_state_alloc(args);



	/*

	 * Search to see if name already exists, and get back a pointer
@@ -899,9 +895,8 @@ xfs_attr_node_addname( 
		 * attr, not the "new" one.

		 */

		args->attr_filter |= XFS_ATTR_INCOMPLETE;

		state = xfs_da_state_alloc();

		state->args = args;

		state->mp = mp;

		state = xfs_da_state_alloc(args);



		state->inleaf = 0;

		error = xfs_da3_node_lookup_int(state, &retval);

		if (error)
@@ -975,9 +970,7 @@ xfs_attr_node_removename( 
	 * Tie a string around our finger to remind us where we are.

	 */

	dp = args->dp;

	state = xfs_da_state_alloc();

	state->args = args;

	state->mp = dp->i_mount;

	state = xfs_da_state_alloc(args);



	/*

	 * Search to see if name exists, and get back a pointer to it.
@@ -1207,9 +1200,7 @@ xfs_attr_node_get(xfs_da_args_t *args) 


	trace_xfs_attr_node_get(args);



	state = xfs_da_state_alloc();

	state->args = args;

	state->mp = args->dp->i_mount;

	state = xfs_da_state_alloc(args);



	/*

	 * Search to see if name exists, and get back a pointer to it.

fs/xfs/libxfs/xfs_da_btree.c

+9 −3
Original line number Diff line number Diff line
@@ -78,10 +78,16 @@ kmem_zone_t *xfs_da_state_zone; /* anchor for state struct zone */ 
 * Allocate a dir-state structure.

 * We don't put them on the stack since they're large.

 */

xfs_da_state_t *

xfs_da_state_alloc(void)

struct xfs_da_state *

xfs_da_state_alloc(

	struct xfs_da_args	*args)

{

	return kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);

	struct xfs_da_state	*state;



	state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);

	state->args = args;

	state->mp = args->dp->i_mount;

	return state;

}



/*

fs/xfs/libxfs/xfs_da_btree.h

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args, 
				const unsigned char *name, int len);





xfs_da_state_t *xfs_da_state_alloc(void);

struct xfs_da_state *xfs_da_state_alloc(struct xfs_da_args *args);

void xfs_da_state_free(xfs_da_state_t *state);



void	xfs_da3_node_hdr_from_disk(struct xfs_mount *mp,

fs/xfs/libxfs/xfs_dir2_node.c

+5 −12
Original line number Diff line number Diff line
@@ -2015,9 +2015,7 @@ xfs_dir2_node_addname( 
	/*

	 * Allocate and initialize the state (btree cursor).

	 */

	state = xfs_da_state_alloc();

	state->args = args;

	state->mp = args->dp->i_mount;

	state = xfs_da_state_alloc(args);

	/*

	 * Look up the name.  We're not supposed to find it, but

	 * this gives us the insertion point.
@@ -2086,9 +2084,8 @@ xfs_dir2_node_lookup( 
	/*

	 * Allocate and initialize the btree cursor.

	 */

	state = xfs_da_state_alloc();

	state->args = args;

	state->mp = args->dp->i_mount;

	state = xfs_da_state_alloc(args);



	/*

	 * Fill in the path to the entry in the cursor.

	 */
@@ -2139,9 +2136,7 @@ xfs_dir2_node_removename( 
	/*

	 * Allocate and initialize the btree cursor.

	 */

	state = xfs_da_state_alloc();

	state->args = args;

	state->mp = args->dp->i_mount;

	state = xfs_da_state_alloc(args);



	/* Look up the entry we're deleting, set up the cursor. */

	error = xfs_da3_node_lookup_int(state, &rval);
@@ -2206,9 +2201,7 @@ xfs_dir2_node_replace( 
	/*

	 * Allocate and initialize the btree cursor.

	 */

	state = xfs_da_state_alloc();

	state->args = args;

	state->mp = args->dp->i_mount;

	state = xfs_da_state_alloc(args);



	/*

	 * We have to save new inode number and ftype since

fs/xfs/scrub/dabtree.c

+1 −3
Original line number Diff line number Diff line
@@ -476,9 +476,7 @@ xchk_da_btree( 
	ds.dargs.whichfork = whichfork;

	ds.dargs.trans = sc->tp;

	ds.dargs.op_flags = XFS_DA_OP_OKNOENT;

	ds.state = xfs_da_state_alloc();

	ds.state->args = &ds.dargs;

	ds.state->mp = mp;

	ds.state = xfs_da_state_alloc(&ds.dargs);

	ds.sc = sc;

	ds.private = private;

	if (whichfork == XFS_ATTR_FORK) {