Commit 6a7584b1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: fold xfs_buf_ioend_finish into xfs_ioend 



No need to keep a separate helper for this logic.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 664ffb8a

fs/xfs/xfs_buf.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -1333,7 +1333,6 @@ xfs_buf_ioend( 
			bp->b_ops->verify_read(bp);

			bp->b_ops->verify_read(bp);

		if (!bp->b_error)

		if (!bp->b_error)

			bp->b_flags |= XBF_DONE;

			bp->b_flags |= XBF_DONE;

		xfs_buf_ioend_finish(bp);

	} else if (bp->b_flags & _XBF_LOGRECOVERY) {

	} else if (bp->b_flags & _XBF_LOGRECOVERY) {

		/*

		/*

		 * If this is a log recovery buffer, we aren't doing

		 * If this is a log recovery buffer, we aren't doing
@@ -1381,9 +1380,12 @@ xfs_buf_ioend( 
			xfs_buf_inode_iodone(bp);

			xfs_buf_inode_iodone(bp);

		else if (bp->b_flags & _XBF_DQUOTS)

		else if (bp->b_flags & _XBF_DQUOTS)

			xfs_buf_dquot_iodone(bp);

			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

static void

fs/xfs/xfs_buf.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -269,13 +269,6 @@ static inline void xfs_buf_relse(xfs_buf_t *bp) 




/* Buffer Read and Write Routines */

/* Buffer Read and Write Routines */

extern int xfs_bwrite(struct xfs_buf *bp);

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,

extern void __xfs_buf_ioerror(struct xfs_buf *bp, int error,

		xfs_failaddr_t failaddr);

		xfs_failaddr_t failaddr);

fs/xfs/xfs_log_recover.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -288,7 +288,6 @@ xlog_recover_iodone( 
		xfs_buf_item_relse(bp);

		xfs_buf_item_relse(bp);

	ASSERT(bp->b_log_item == NULL);

	ASSERT(bp->b_log_item == NULL);

	bp->b_flags &= ~_XBF_LOGRECOVERY;

	bp->b_flags &= ~_XBF_LOGRECOVERY;

	xfs_buf_ioend_finish(bp);

}

}





/*

/*