mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
xfs: use ->t_dfops for all xfs_bmapi_write() callers
Attach ->t_dfops for all remaining callers of xfs_bmapi_write(). This prepares the latter to no longer require a separate dfops parameter. Note that xfs_symlink() already uses ->t_dfops. Fix up the local references for consistency. 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>
This commit is contained in:
parent
2ba1372125
commit
175d1a013e
5 changed files with 26 additions and 20 deletions
|
@ -788,13 +788,14 @@ xfs_growfs_rt_alloc(
|
|||
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
|
||||
|
||||
xfs_defer_init(&dfops, &firstblock);
|
||||
tp->t_dfops = &dfops;
|
||||
/*
|
||||
* Allocate blocks to the bitmap file.
|
||||
*/
|
||||
nmap = 1;
|
||||
error = xfs_bmapi_write(tp, ip, oblocks, nblocks - oblocks,
|
||||
XFS_BMAPI_METADATA, &firstblock,
|
||||
resblks, &map, &nmap, &dfops);
|
||||
resblks, &map, &nmap, tp->t_dfops);
|
||||
if (!error && nmap < 1)
|
||||
error = -ENOSPC;
|
||||
if (error)
|
||||
|
@ -802,7 +803,7 @@ xfs_growfs_rt_alloc(
|
|||
/*
|
||||
* Free any blocks freed up in the transaction, then commit.
|
||||
*/
|
||||
error = xfs_defer_finish(&tp, &dfops);
|
||||
error = xfs_defer_finish(&tp, tp->t_dfops);
|
||||
if (error)
|
||||
goto out_bmap_cancel;
|
||||
error = xfs_trans_commit(tp);
|
||||
|
@ -855,7 +856,7 @@ xfs_growfs_rt_alloc(
|
|||
return 0;
|
||||
|
||||
out_bmap_cancel:
|
||||
xfs_defer_cancel(&dfops);
|
||||
xfs_defer_cancel(tp->t_dfops);
|
||||
out_trans_cancel:
|
||||
xfs_trans_cancel(tp);
|
||||
return error;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue