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: drop unnecessary xfs_defer_finish() dfops parameter

Browse source 
Every caller of xfs_defer_finish() now passes the transaction and
its associated ->t_dfops. The xfs_defer_ops parameter is therefore
no longer necessary and can be removed.

Since most xfs_defer_finish() callers also have to consider
xfs_defer_cancel() on error, update the latter to also receive the
transaction for consistency. The log recovery code contains an
outlier case that cancels a dfops directly without an available
transaction. Retain an internal wrapper to support this outlier case
for the time being.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@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-24 13:43:15 -07:00 • committed by Darrick J. Wong
parent d5cca7eb24
commit 9e28a242be
11 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/xfs/xfs_bmap_util.c
View file

@ -1624,7 +1624,7 @@ xfs_swap_extent_rmap(
goto out_defer;
xfs_defer_ijoin(tp->t_dfops, ip);
error = xfs_defer_finish(tpp, tp->t_dfops);
error = xfs_defer_finish(tpp);
tp = *tpp;
if (error)
goto out_defer;
@ -1645,7 +1645,7 @@ xfs_swap_extent_rmap(
return 0;
out_defer:
xfs_defer_cancel(tp->t_dfops);
xfs_defer_cancel(tp);
out:
trace_xfs_swap_extent_rmap_error(ip, error, _RET_IP_);
tip->i_d.di_flags2 = tip_flags2;