diff options
| author | Brian Foster <bfoster@redhat.com> | 2018-07-11 22:26:11 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-07-11 22:26:11 -0700 |
| commit | 32a9b7c65cfc7d9283055fc9d61e6393ee2aa984 (patch) | |
| tree | e001ea2e01dcdc2a19c678a256ce72872b392e13 /fs/xfs/libxfs/xfs_da_btree.c | |
| parent | d76e6ce8ed6943941c0c964d8ae43fdaefdcbb5a (diff) | |
| download | linux-32a9b7c65cfc7d9283055fc9d61e6393ee2aa984.tar.gz linux-32a9b7c65cfc7d9283055fc9d61e6393ee2aa984.tar.bz2 linux-32a9b7c65cfc7d9283055fc9d61e6393ee2aa984.zip | |
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: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/libxfs/xfs_da_btree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_da_btree.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index 8a301402bbc4..d2048e4e93ec 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -2063,7 +2063,7 @@ xfs_da_grow_inode_int( error = xfs_bmapi_write(tp, dp, *bno, count, xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG, args->firstblock, args->total, &map, &nmap, - args->dfops); + args->trans->t_dfops); if (error) return error; @@ -2086,7 +2086,8 @@ xfs_da_grow_inode_int( error = xfs_bmapi_write(tp, dp, b, c, xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA, args->firstblock, args->total, - &mapp[mapi], &nmap, args->dfops); + &mapp[mapi], &nmap, + args->trans->t_dfops); if (error) goto out_free_map; if (nmap < 1) @@ -2375,13 +2376,13 @@ done: */ int xfs_da_shrink_inode( - xfs_da_args_t *args, - xfs_dablk_t dead_blkno, - struct xfs_buf *dead_buf) + struct xfs_da_args *args, + xfs_dablk_t dead_blkno, + struct xfs_buf *dead_buf) { - xfs_inode_t *dp; - int done, error, w, count; - xfs_trans_t *tp; + struct xfs_inode *dp; + int done, error, w, count; + struct xfs_trans *tp; trace_xfs_da_shrink_inode(args); @@ -2396,7 +2397,7 @@ xfs_da_shrink_inode( */ error = xfs_bunmapi(tp, dp, dead_blkno, count, xfs_bmapi_aflag(w), 0, args->firstblock, - args->dfops, &done); + args->trans->t_dfops, &done); if (error == -ENOSPC) { if (w != XFS_DATA_FORK) break; |