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>

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 16a325d..19a4996 100644 (file)
--- 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

diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index bea20d4..9eb4044 100644 (file)
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -269,13 +269,6 @@ static inline void xfs_buf_relse(xfs_buf_t *bp)
 
 /* Buffer Read and Write Routines */
 extern int xfs_bwrite(struct xfs_buf *bp);
-static inline void xfs_buf_ioend_finish(struct xfs_buf *bp)
-{
-       if (bp->b_flags & XBF_ASYNC)
-               xfs_buf_relse(bp);
-       else
-               complete(&bp->b_iowait);
-}
 
 extern void __xfs_buf_ioerror(struct xfs_buf *bp, int error,
                xfs_failaddr_t failaddr);

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 5b2e506..3813044 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -288,7 +288,6 @@ xlog_recover_iodone(
                xfs_buf_item_relse(bp);
        ASSERT(bp->b_log_item == NULL);
        bp->b_flags &= ~_XBF_LOGRECOVERY;
-       xfs_buf_ioend_finish(bp);
 }
 
 /*