summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_refcount_item.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-08-28 19:21:04 +0200
committerDarrick J. Wong <darrick.wong@oracle.com>2017-09-01 19:55:30 +0200
commit8ad7c629b18695ec1ee8654fb27599864049862b (patch)
tree759470d1f952515a13e230385a3767a86969f266 /fs/xfs/xfs_refcount_item.c
parentxfs: rename xfs_defer_join to xfs_defer_ijoin (diff)
downloadlinux-8ad7c629b18695ec1ee8654fb27599864049862b.tar.xz
linux-8ad7c629b18695ec1ee8654fb27599864049862b.zip
xfs: remove the ip argument to xfs_defer_finish
And instead require callers to explicitly join the inode using xfs_defer_ijoin. Also consolidate the defer error handling in a few places using a goto label. Signed-off-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/xfs_refcount_item.c')
-rw-r--r--fs/xfs/xfs_refcount_item.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index 96fe209b5eb6..8f2e2fac4255 100644
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -525,7 +525,7 @@ xfs_cui_recover(
}
xfs_refcount_finish_one_cleanup(tp, rcur, error);
- error = xfs_defer_finish(&tp, &dfops, NULL);
+ error = xfs_defer_finish(&tp, &dfops);
if (error)
goto abort_defer;
set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags);