GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: use ->t_dfops for collapse/insert range operations

Browse source 
Use ->t_dfops for the collapse and insert range transactions. These
are the only callers of the respective bmap helpers, so replace the
unnecessary dfops parameters with direct accesses to ->t_dfops.

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:
Brian Foster 2018-07-11 22:26:15 -07:00 • committed by Darrick J. Wong
parent 3e3673e302
commit f4a9cf97fa
3 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fs/xfs/xfs_bmap_util.c
View file

@ -1348,12 +1348,13 @@ xfs_collapse_file_space(
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
xfs_defer_init(&dfops, &first_block);
tp->t_dfops = &dfops;
error = xfs_bmap_collapse_extents(tp, ip, &next_fsb, shift_fsb,
&done, &first_block, &dfops);
&done, &first_block);
if (error)
goto out_bmap_cancel;
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);
@ -1362,7 +1363,7 @@ xfs_collapse_file_space(
return error;
out_bmap_cancel:
xfs_defer_cancel(&dfops);
xfs_defer_cancel(tp->t_dfops);
out_trans_cancel:
xfs_trans_cancel(tp);
return error;
@ -1427,12 +1428,13 @@ xfs_insert_file_space(
xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
xfs_defer_init(&dfops, &first_block);
tp->t_dfops = &dfops;
error = xfs_bmap_insert_extents(tp, ip, &next_fsb, shift_fsb,
&done, stop_fsb, &first_block, &dfops);
&done, stop_fsb, &first_block);
if (error)
goto out_bmap_cancel;
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);
@ -1441,7 +1443,7 @@ xfs_insert_file_space(
return error;
out_bmap_cancel:
xfs_defer_cancel(&dfops);
xfs_defer_cancel(tp->t_dfops);
xfs_trans_cancel(tp);
return error;
}