summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_buf.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-09-01 20:55:44 +0300
committerDarrick J. Wong <darrick.wong@oracle.com>2020-09-16 06:52:38 +0300
commit6a7584b1d82b7b9fcce02ee7aeddc58f9cebbccc (patch)
tree4898cc96725abf2f0f29885344d3e03ce884f72c /fs/xfs/xfs_buf.c
parent664ffb8a429a800c51964b94c15c6a92c8d8334c (diff)
downloadlinux-6a7584b1d82b7b9fcce02ee7aeddc58f9cebbccc.tar.xz
xfs: fold xfs_buf_ioend_finish into xfs_ioend
No need to keep a separate helper for this logic. 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_buf.c')
-rw-r--r--fs/xfs/xfs_buf.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 16a325d6e21f..19a49969431b 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1333,7 +1333,6 @@ xfs_buf_ioend(
bp->b_ops->verify_read(bp);
if (!bp->b_error)
bp->b_flags |= XBF_DONE;
- xfs_buf_ioend_finish(bp);
} else if (bp->b_flags & _XBF_LOGRECOVERY) {
/*
* If this is a log recovery buffer, we aren't doing
@@ -1381,9 +1380,12 @@ xfs_buf_ioend(
xfs_buf_inode_iodone(bp);
else if (bp->b_flags & _XBF_DQUOTS)
xfs_buf_dquot_iodone(bp);
-
- xfs_buf_ioend_finish(bp);
}
+
+ if (bp->b_flags & XBF_ASYNC)
+ xfs_buf_relse(bp);
+ else
+ complete(&bp->b_iowait);
}
static void