xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: use ->t_dfops for all xfs_bunmapi() callers

Browse Source 
Use ->t_dfops for all remaining xfs_bunmapi() callers. This prepares
the latter to no longer require a dfops parameter.

Note that xfs_itruncate_extents_flags() associates a local dfops
with a transaction provided from the caller. Since there are
multiple callers, set and reset ->t_dfops before the function
returns to avoid exposure of stack memory to the caller.

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:13 -07:00
committed by Darrick J. Wong
parent 6e702a5dcb
commit 4bcfa613a0
4 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/xfs/xfs_bmap_util.c
View File

@@ -1044,13 +1044,14 @@ xfs_unmap_extent(
xfs_trans_ijoin(tp, ip, 0);
xfs_defer_init(&dfops, &firstfsb);
tp->t_dfops = &dfops;
error = xfs_bunmapi(tp, ip, startoffset_fsb, len_fsb, 0, 2, &firstfsb,
&dfops, done);
tp->t_dfops, done);
if (error)
goto out_bmap_cancel;
xfs_defer_ijoin(&dfops, ip);
error = xfs_defer_finish(&tp, &dfops);
xfs_defer_ijoin(tp->t_dfops, ip);
error = xfs_defer_finish(&tp, tp->t_dfops);
if (error)
goto out_bmap_cancel;
@@ -1060,7 +1061,7 @@ out_unlock:
return error;
out_bmap_cancel:
xfs_defer_cancel(&dfops);
xfs_defer_cancel(tp->t_dfops);
out_trans_cancel:
xfs_trans_cancel(tp);
goto out_unlock;