Commit 32a9b7c6 authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong

xfs: replace xfs_da_args->dfops accesses with ->t_dfops and remove

Now that xfs_da_args->dfops is always assigned from a ->t_dfops
pointer (or one that is immediately attached), replace all
downstream accesses of the former with the latter and remove the
field from struct xfs_da_args.
Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent d76e6ce8
...@@ -220,7 +220,6 @@ xfs_attr_set( ...@@ -220,7 +220,6 @@ xfs_attr_set(
args.value = value; args.value = value;
args.valuelen = valuelen; args.valuelen = valuelen;
args.firstblock = &firstblock; args.firstblock = &firstblock;
args.dfops = &dfops;
args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT; args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
args.total = xfs_attr_calc_size(&args, &local); args.total = xfs_attr_calc_size(&args, &local);
...@@ -407,7 +406,6 @@ xfs_attr_remove( ...@@ -407,7 +406,6 @@ xfs_attr_remove(
return error; return error;
args.firstblock = &firstblock; args.firstblock = &firstblock;
args.dfops = &dfops;
/* /*
* we have no control over the attribute names that userspace passes us * we have no control over the attribute names that userspace passes us
...@@ -539,11 +537,12 @@ xfs_attr_shortform_addname(xfs_da_args_t *args) ...@@ -539,11 +537,12 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
* if bmap_one_block() says there is only one block (ie: no remote blks). * if bmap_one_block() says there is only one block (ie: no remote blks).
*/ */
STATIC int STATIC int
xfs_attr_leaf_addname(xfs_da_args_t *args) xfs_attr_leaf_addname(
struct xfs_da_args *args)
{ {
xfs_inode_t *dp; struct xfs_inode *dp;
struct xfs_buf *bp; struct xfs_buf *bp;
int retval, error, forkoff; int retval, error, forkoff;
trace_xfs_attr_leaf_addname(args); trace_xfs_attr_leaf_addname(args);
...@@ -601,12 +600,12 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) ...@@ -601,12 +600,12 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
* Commit that transaction so that the node_addname() call * Commit that transaction so that the node_addname() call
* can manage its own transactions. * can manage its own transactions.
*/ */
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_attr3_leaf_to_node(args); error = xfs_attr3_leaf_to_node(args);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
...@@ -690,13 +689,13 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) ...@@ -690,13 +689,13 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
* If the result is small enough, shrink it all into the inode. * If the result is small enough, shrink it all into the inode.
*/ */
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) { if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff); error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */ /* bp is gone due to xfs_da_shrink_inode */
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
} }
...@@ -714,7 +713,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) ...@@ -714,7 +713,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
} }
return error; return error;
out_defer_cancel: out_defer_cancel:
xfs_defer_cancel(args->dfops); xfs_defer_cancel(args->trans->t_dfops);
return error; return error;
} }
...@@ -725,11 +724,12 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) ...@@ -725,11 +724,12 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
* if bmap_one_block() says there is only one block (ie: no remote blks). * if bmap_one_block() says there is only one block (ie: no remote blks).
*/ */
STATIC int STATIC int
xfs_attr_leaf_removename(xfs_da_args_t *args) xfs_attr_leaf_removename(
struct xfs_da_args *args)
{ {
xfs_inode_t *dp; struct xfs_inode *dp;
struct xfs_buf *bp; struct xfs_buf *bp;
int error, forkoff; int error, forkoff;
trace_xfs_attr_leaf_removename(args); trace_xfs_attr_leaf_removename(args);
...@@ -754,19 +754,19 @@ xfs_attr_leaf_removename(xfs_da_args_t *args) ...@@ -754,19 +754,19 @@ xfs_attr_leaf_removename(xfs_da_args_t *args)
* If the result is small enough, shrink it all into the inode. * If the result is small enough, shrink it all into the inode.
*/ */
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) { if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff); error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */ /* bp is gone due to xfs_da_shrink_inode */
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
} }
return 0; return 0;
out_defer_cancel: out_defer_cancel:
xfs_defer_cancel(args->dfops); xfs_defer_cancel(args->trans->t_dfops);
return error; return error;
} }
...@@ -817,13 +817,14 @@ xfs_attr_leaf_get(xfs_da_args_t *args) ...@@ -817,13 +817,14 @@ xfs_attr_leaf_get(xfs_da_args_t *args)
* add a whole extra layer of confusion on top of that. * add a whole extra layer of confusion on top of that.
*/ */
STATIC int STATIC int
xfs_attr_node_addname(xfs_da_args_t *args) xfs_attr_node_addname(
struct xfs_da_args *args)
{ {
xfs_da_state_t *state; struct xfs_da_state *state;
xfs_da_state_blk_t *blk; struct xfs_da_state_blk *blk;
xfs_inode_t *dp; struct xfs_inode *dp;
xfs_mount_t *mp; struct xfs_mount *mp;
int retval, error; int retval, error;
trace_xfs_attr_node_addname(args); trace_xfs_attr_node_addname(args);
...@@ -882,12 +883,13 @@ xfs_attr_node_addname(xfs_da_args_t *args) ...@@ -882,12 +883,13 @@ xfs_attr_node_addname(xfs_da_args_t *args)
*/ */
xfs_da_state_free(state); xfs_da_state_free(state);
state = NULL; state = NULL;
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_attr3_leaf_to_node(args); error = xfs_attr3_leaf_to_node(args);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans,
args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
...@@ -908,12 +910,12 @@ xfs_attr_node_addname(xfs_da_args_t *args) ...@@ -908,12 +910,12 @@ xfs_attr_node_addname(xfs_da_args_t *args)
* in the index/blkno/rmtblkno/rmtblkcnt fields and * in the index/blkno/rmtblkno/rmtblkcnt fields and
* in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields. * in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields.
*/ */
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_da3_split(state); error = xfs_da3_split(state);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
} else { } else {
...@@ -1006,12 +1008,12 @@ xfs_attr_node_addname(xfs_da_args_t *args) ...@@ -1006,12 +1008,12 @@ xfs_attr_node_addname(xfs_da_args_t *args)
* Check to see if the tree needs to be collapsed. * Check to see if the tree needs to be collapsed.
*/ */
if (retval && (state->path.active > 1)) { if (retval && (state->path.active > 1)) {
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_da3_join(state); error = xfs_da3_join(state);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
} }
...@@ -1040,7 +1042,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) ...@@ -1040,7 +1042,7 @@ xfs_attr_node_addname(xfs_da_args_t *args)
return error; return error;
return retval; return retval;
out_defer_cancel: out_defer_cancel:
xfs_defer_cancel(args->dfops); xfs_defer_cancel(args->trans->t_dfops);
goto out; goto out;
} }
...@@ -1052,13 +1054,14 @@ xfs_attr_node_addname(xfs_da_args_t *args) ...@@ -1052,13 +1054,14 @@ xfs_attr_node_addname(xfs_da_args_t *args)
* the root node (a special case of an intermediate node). * the root node (a special case of an intermediate node).
*/ */
STATIC int STATIC int
xfs_attr_node_removename(xfs_da_args_t *args) xfs_attr_node_removename(
struct xfs_da_args *args)
{ {
xfs_da_state_t *state; struct xfs_da_state *state;
xfs_da_state_blk_t *blk; struct xfs_da_state_blk *blk;
xfs_inode_t *dp; struct xfs_inode *dp;
struct xfs_buf *bp; struct xfs_buf *bp;
int retval, error, forkoff; int retval, error, forkoff;
trace_xfs_attr_node_removename(args); trace_xfs_attr_node_removename(args);
...@@ -1130,12 +1133,12 @@ xfs_attr_node_removename(xfs_da_args_t *args) ...@@ -1130,12 +1133,12 @@ xfs_attr_node_removename(xfs_da_args_t *args)
* Check to see if the tree needs to be collapsed. * Check to see if the tree needs to be collapsed.
*/ */
if (retval && (state->path.active > 1)) { if (retval && (state->path.active > 1)) {
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_da3_join(state); error = xfs_da3_join(state);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
/* /*
...@@ -1162,13 +1165,13 @@ xfs_attr_node_removename(xfs_da_args_t *args) ...@@ -1162,13 +1165,13 @@ xfs_attr_node_removename(xfs_da_args_t *args)
goto out; goto out;
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) { if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff); error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */ /* bp is gone due to xfs_da_shrink_inode */
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
} else } else
...@@ -1180,7 +1183,7 @@ xfs_attr_node_removename(xfs_da_args_t *args) ...@@ -1180,7 +1183,7 @@ xfs_attr_node_removename(xfs_da_args_t *args)
xfs_da_state_free(state); xfs_da_state_free(state);
return error; return error;
out_defer_cancel: out_defer_cancel:
xfs_defer_cancel(args->dfops); xfs_defer_cancel(args->trans->t_dfops);
goto out; goto out;
} }
......
...@@ -747,18 +747,18 @@ xfs_attr_shortform_getvalue(xfs_da_args_t *args) ...@@ -747,18 +747,18 @@ xfs_attr_shortform_getvalue(xfs_da_args_t *args)
*/ */
int int
xfs_attr_shortform_to_leaf( xfs_attr_shortform_to_leaf(
struct xfs_da_args *args, struct xfs_da_args *args,
struct xfs_buf **leaf_bp) struct xfs_buf **leaf_bp)
{ {
xfs_inode_t *dp; struct xfs_inode *dp;
xfs_attr_shortform_t *sf; struct xfs_attr_shortform *sf;
xfs_attr_sf_entry_t *sfe; struct xfs_attr_sf_entry *sfe;
xfs_da_args_t nargs; struct xfs_da_args nargs;
char *tmpbuffer; char *tmpbuffer;
int error, i, size; int error, i, size;
xfs_dablk_t blkno; xfs_dablk_t blkno;
struct xfs_buf *bp; struct xfs_buf *bp;
xfs_ifork_t *ifp; struct xfs_ifork *ifp;
trace_xfs_attr_sf_to_leaf(args); trace_xfs_attr_sf_to_leaf(args);
...@@ -803,7 +803,6 @@ xfs_attr_shortform_to_leaf( ...@@ -803,7 +803,6 @@ xfs_attr_shortform_to_leaf(
nargs.dp = dp; nargs.dp = dp;
nargs.geo = args->geo; nargs.geo = args->geo;
nargs.firstblock = args->firstblock; nargs.firstblock = args->firstblock;
nargs.dfops = args->dfops;
nargs.total = args->total; nargs.total = args->total;
nargs.whichfork = XFS_ATTR_FORK; nargs.whichfork = XFS_ATTR_FORK;
nargs.trans = args->trans; nargs.trans = args->trans;
...@@ -1007,7 +1006,6 @@ xfs_attr3_leaf_to_shortform( ...@@ -1007,7 +1006,6 @@ xfs_attr3_leaf_to_shortform(
nargs.geo = args->geo; nargs.geo = args->geo;
nargs.dp = dp; nargs.dp = dp;
nargs.firstblock = args->firstblock; nargs.firstblock = args->firstblock;
nargs.dfops = args->dfops;
nargs.total = args->total; nargs.total = args->total;
nargs.whichfork = XFS_ATTR_FORK; nargs.whichfork = XFS_ATTR_FORK;
nargs.trans = args->trans; nargs.trans = args->trans;
......
...@@ -480,15 +480,16 @@ xfs_attr_rmtval_set( ...@@ -480,15 +480,16 @@ xfs_attr_rmtval_set(
* extent and then crash then the block may not contain the * extent and then crash then the block may not contain the
* correct metadata after log recovery occurs. * correct metadata after log recovery occurs.
*/ */
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
nmap = 1; nmap = 1;
error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)lblkno, error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)lblkno,
blkcnt, XFS_BMAPI_ATTRFORK, args->firstblock, blkcnt, XFS_BMAPI_ATTRFORK, args->firstblock,
args->total, &map, &nmap, args->dfops); args->total, &map, &nmap,
args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, dp); xfs_defer_ijoin(args->trans->t_dfops, dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
...@@ -522,7 +523,7 @@ xfs_attr_rmtval_set( ...@@ -522,7 +523,7 @@ xfs_attr_rmtval_set(
ASSERT(blkcnt > 0); ASSERT(blkcnt > 0);
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
nmap = 1; nmap = 1;
error = xfs_bmapi_read(dp, (xfs_fileoff_t)lblkno, error = xfs_bmapi_read(dp, (xfs_fileoff_t)lblkno,
blkcnt, &map, &nmap, blkcnt, &map, &nmap,
...@@ -557,7 +558,7 @@ xfs_attr_rmtval_set( ...@@ -557,7 +558,7 @@ xfs_attr_rmtval_set(
ASSERT(valuelen == 0); ASSERT(valuelen == 0);
return 0; return 0;
out_defer_cancel: out_defer_cancel:
xfs_defer_cancel(args->dfops); xfs_defer_cancel(args->trans->t_dfops);
args->trans = NULL; args->trans = NULL;
return error; return error;
} }
...@@ -626,14 +627,14 @@ xfs_attr_rmtval_remove( ...@@ -626,14 +627,14 @@ xfs_attr_rmtval_remove(
blkcnt = args->rmtblkcnt; blkcnt = args->rmtblkcnt;
done = 0; done = 0;
while (!done) { while (!done) {
xfs_defer_init(args->dfops, args->firstblock); xfs_defer_init(args->trans->t_dfops, args->firstblock);
error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt, error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,
XFS_BMAPI_ATTRFORK, 1, args->firstblock, XFS_BMAPI_ATTRFORK, 1, args->firstblock,
args->dfops, &done); args->trans->t_dfops, &done);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
xfs_defer_ijoin(args->dfops, args->dp); xfs_defer_ijoin(args->trans->t_dfops, args->dp);
error = xfs_defer_finish(&args->trans, args->dfops); error = xfs_defer_finish(&args->trans, args->trans->t_dfops);
if (error) if (error)
goto out_defer_cancel; goto out_defer_cancel;
...@@ -646,7 +647,7 @@ xfs_attr_rmtval_remove( ...@@ -646,7 +647,7 @@ xfs_attr_rmtval_remove(
} }
return 0; return 0;
out_defer_cancel: out_defer_cancel:
xfs_defer_cancel(args->dfops); xfs_defer_cancel(args->trans->t_dfops);
args->trans = NULL; args->trans = NULL;
return error; return error;
} }
...@@ -1007,7 +1007,6 @@ xfs_bmap_add_attrfork_local( ...@@ -1007,7 +1007,6 @@ xfs_bmap_add_attrfork_local(
dargs.geo = ip->i_mount->m_dir_geo; dargs.geo = ip->i_mount->m_dir_geo;
dargs.dp = ip; dargs.dp = ip;
dargs.firstblock = firstblock; dargs.firstblock = firstblock;
dargs.dfops = tp->t_dfops;
dargs.total = dargs.geo->fsbcount; dargs.total = dargs.geo->fsbcount;
dargs.whichfork = XFS_DATA_FORK; dargs.whichfork = XFS_DATA_FORK;
dargs.trans = tp; dargs.trans = tp;
......
...@@ -2063,7 +2063,7 @@ xfs_da_grow_inode_int( ...@@ -2063,7 +2063,7 @@ xfs_da_grow_inode_int(
error = xfs_bmapi_write(tp, dp, *bno, count, error = xfs_bmapi_write(tp, dp, *bno, count,
xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG, xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG,
args->firstblock, args->total, &map, &nmap, args->firstblock, args->total, &map, &nmap,
args->dfops); args->trans->t_dfops);
if (error) if (error)
return error; return error;
...@@ -2086,7 +2086,8 @@ xfs_da_grow_inode_int( ...@@ -2086,7 +2086,8 @@ xfs_da_grow_inode_int(
error = xfs_bmapi_write(tp, dp, b, c, error = xfs_bmapi_write(tp, dp, b, c,
xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA, xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA,
args->firstblock, args->total, args->firstblock, args->total,
&mapp[mapi], &nmap, args->dfops); &mapp[mapi], &nmap,
args->trans->t_dfops);
if (error) if (error)
goto out_free_map; goto out_free_map;
if (nmap < 1) if (nmap < 1)
...@@ -2375,13 +2376,13 @@ xfs_da3_swap_lastblock( ...@@ -2375,13 +2376,13 @@ xfs_da3_swap_lastblock(
*/ */
int int
xfs_da_shrink_inode( xfs_da_shrink_inode(
xfs_da_args_t *args, struct xfs_da_args *args,
xfs_dablk_t dead_blkno, xfs_dablk_t dead_blkno,
struct xfs_buf *dead_buf) struct xfs_buf *dead_buf)
{ {
xfs_inode_t *dp; struct xfs_inode *dp;
int done, error, w, count; int done, error, w, count;
xfs_trans_t *tp; struct xfs_trans *tp;
trace_xfs_da_shrink_inode(args); trace_xfs_da_shrink_inode(args);
...@@ -2396,7 +2397,7 @@ xfs_da_shrink_inode( ...@@ -2396,7 +2397,7 @@ xfs_da_shrink_inode(
*/ */
error = xfs_bunmapi(tp, dp, dead_blkno, count, error = xfs_bunmapi(tp, dp, dead_blkno, count,
xfs_bmapi_aflag(w), 0, args->firstblock, xfs_bmapi_aflag(w), 0, args->firstblock,
args->dfops, &done); args->trans->t_dfops, &done);
if (error == -ENOSPC) { if (error == -ENOSPC) {
if (w != XFS_DATA_FORK) if (w != XFS_DATA_FORK)
break; break;
......
...@@ -58,7 +58,6 @@ typedef struct xfs_da_args { ...@@ -58,7 +58,6 @@ typedef struct xfs_da_args {
xfs_ino_t inumber; /* input/output inode number */ xfs_ino_t inumber; /* input/output inode number */
struct xfs_inode *dp; /* directory inode to manipulate */ struct xfs_inode *dp; /* directory inode to manipulate */
xfs_fsblock_t *firstblock; /* ptr to firstblock for bmap calls */ xfs_fsblock_t *firstblock; /* ptr to firstblock for bmap calls */
struct xfs_defer_ops *dfops; /* ptr to freelist for bmap_finish */
struct xfs_trans *trans; /* current trans (changes over time) */ struct xfs_trans *trans; /* current trans (changes over time) */
xfs_extlen_t total; /* total blocks needed, for 1st bmap */ xfs_extlen_t total; /* total blocks needed, for 1st bmap */
int whichfork; /* data or attribute fork */ int whichfork; /* data or attribute fork */
......
...@@ -239,8 +239,8 @@ xfs_dir_init( ...@@ -239,8 +239,8 @@ xfs_dir_init(
*/ */
int int
xfs_dir_createname( xfs_dir_createname(
xfs_trans_t *tp, struct xfs_trans *tp,
xfs_inode_t *dp, struct xfs_inode *dp,
struct xfs_name *name, struct xfs_name *name,
xfs_ino_t inum, /* new entry inode number */ xfs_ino_t inum, /* new entry inode number */
xfs_fsblock_t *first, /* bmap's firstblock */ xfs_fsblock_t *first, /* bmap's firstblock */
...@@ -274,7 +274,6 @@ xfs_dir_createname( ...@@ -274,7 +274,6 @@ xfs_dir_createname(
args->total = total; args->total = total;
args->whichfork = XFS_DATA_FORK; args->whichfork = XFS_DATA_FORK;
args->trans = tp; args->trans = tp;
args->dfops = tp->t_dfops;
args->firstblock = first; args->firstblock = first;
args->op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT; args->op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
if (!inum) if (!inum)
...@@ -417,16 +416,16 @@ xfs_dir_lookup( ...@@ -417,16 +416,16 @@ xfs_dir_lookup(
*/ */
int int
xfs_dir_removename( xfs_dir_removename(
xfs_trans_t *tp, struct xfs_trans *tp,
xfs_inode_t *dp, struct xfs_inode *dp,
struct xfs_name *name, struct xfs_name *name,
xfs_ino_t ino, xfs_ino_t ino,
xfs_fsblock_t *first, /* bmap's firstblock */ xfs_fsblock_t *first, /* bmap's firstblock */
xfs_extlen_t total) /* bmap's total block count */ xfs_extlen_t total) /* bmap's total block count */
{ {
struct xfs_da_args *args; struct xfs_da_args *args;
int rval; int rval;
int v; /* type-checking value */ int v; /* type-checking value */
ASSERT(S_ISDIR(VFS_I(dp)->i_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
ASSERT(tp->t_dfops); ASSERT(tp->t_dfops);
...@@ -447,7 +446,6 @@ xfs_dir_removename( ...@@ -447,7 +446,6 @@ xfs_dir_removename(
args->total = total; args->total = total;
args->whichfork = XFS_DATA_FORK; args->whichfork = XFS_DATA_FORK;
args->trans = tp; args->trans = tp;
args->dfops = tp->t_dfops;
if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) { if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
rval = xfs_dir2_sf_removename(args); rval = xfs_dir2_sf_removename(args);
...@@ -479,16 +477,16 @@ xfs_dir_removename( ...@@ -479,16 +477,16 @@ xfs_dir_removename(
*/ */
int int
xfs_dir_replace( xfs_dir_replace(
xfs_trans_t *tp, struct xfs_trans *tp,
xfs_inode_t *dp, struct xfs_inode *dp,
struct xfs_name *name, /* name of entry to replace */ struct xfs_name *name, /* name of entry to replace */
xfs_ino_t inum, /* new inode number */ xfs_ino_t inum, /* new inode number */
xfs_fsblock_t *first, /* bmap's firstblock */ xfs_fsblock_t *first, /* bmap's firstblock */
xfs_extlen_t total) /* bmap's total block count */ xfs_extlen_t total) /* bmap's total block count */
{ {
struct xfs_da_args *args; struct xfs_da_args *args;
int rval; int rval;
int v; /* type-checking value */ int v; /* type-checking value */
ASSERT(S_ISDIR(VFS_I(dp)->i_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
ASSERT(tp->t_dfops); ASSERT(tp->t_dfops);
...@@ -512,7 +510,6 @@ xfs_dir_replace( ...@@ -512,7 +510,6 @@ xfs_dir_replace(
args->total = total; args->total = total;
args->whichfork = XFS_DATA_FORK; args->whichfork = XFS_DATA_FORK;
args->trans = tp; args->trans = tp;
args->dfops = tp->t_dfops;
if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) { if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
rval = xfs_dir2_sf_replace(args); rval = xfs_dir2_sf_replace(args);
...@@ -646,17 +643,17 @@ xfs_dir2_isleaf( ...@@ -646,17 +643,17 @@ xfs_dir2_isleaf(
*/ */
int int
xfs_dir2_shrink_inode( xfs_dir2_shrink_inode(
xfs_da_args_t *args, struct xfs_da_args *args,
xfs_dir2_db_t db, xfs_dir2_db_t db,
struct xfs_buf *bp) struct xfs_buf *bp)
{ {
xfs_fileoff_t bno; /* directory file offset */ xfs_fileoff_t bno; /* directory file offset */
xfs_dablk_t da; /* directory file offset */ xfs_dablk_t da; /* directory file offset */
int done; /* bunmap is finished */ int done; /* bunmap is finished */
xfs_inode_t *dp; struct xfs_inode *dp;
int error; int error;
xfs_mount_t *mp; struct xfs_mount *mp;
xfs_trans_t *tp; struct xfs_trans *tp;
trace_xfs_dir2_shrink_inode(args, db); trace_xfs_dir2_shrink_inode(args, db);
...@@ -667,7 +664,7 @@ xfs_dir2_shrink_inode( ...@@ -667,7 +664,7 @@ xfs_dir2_shrink_inode(
/* Unmap the fsblock(s). */ /* Unmap the fsblock(s). */
error = xfs_bunmapi(tp, dp, da, args->geo->fsbcount, 0, 0, error = xfs_bunmapi(tp, dp, da, args->geo->fsbcount, 0, 0,
args->firstblock, args->dfops, &done); args->firstblock, args->trans->t_dfops, &done);
if (error) { if (error) {
/* /*
* ENOSPC actually can happen if we're in a removename with no * ENOSPC actually can happen if we're in a removename with no
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment