On Tue, Jun 02, 2020 at 07:42:28AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> All unmarked dirty buffers should be in the AIL and have log items
> attached to them. Hence when they are written, we will run a
> callback to remove the item from the AIL if appropriate. Now that
> we've handled inode and dquot buffers, all remaining calls are to
> xfs_buf_iodone() and so we can hard code this rather than use an
> indirect call.
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> Reviewed-by: Amir Goldstein <amir73il@xxxxxxxxx>
> ---
> fs/xfs/xfs_buf.c | 24 ++++++++----------------
> fs/xfs/xfs_buf.h | 6 +-----
> fs/xfs/xfs_buf_item.c | 40 ++++++++++------------------------------
> fs/xfs/xfs_buf_item.h | 4 ++--
> fs/xfs/xfs_trans_buf.c | 13 +++----------
> 5 files changed, 24 insertions(+), 63 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 0a69de674af9d..d7695b638e994 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
...
> @@ -1226,14 +1225,7 @@ xfs_buf_ioend(
> xfs_buf_dquot_iodone(bp);
> return;
> }
> -
> - if (bp->b_iodone) {
> - (*(bp->b_iodone))(bp);
> - return;
> - }
> -
> -out_finish:
> - xfs_buf_ioend_finish(bp);
> + xfs_buf_iodone(bp);
The way this function ends up would probably look nicer as an if/else
chain rather than a sequence of internal return statements.
> }
>
> static void
...
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index a42cdf9ccc47d..d87ae6363a130 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
...
> @@ -1182,28 +1166,24 @@ xfs_buf_run_callbacks(
> xfs_buf_do_callbacks(bp);
> bp->b_log_item = NULL;
> list_del_init(&bp->b_li_list);
> - bp->b_iodone = NULL;
> }
>
> /*
> - * This is the iodone() function for buffers which have had callbacks attached
> - * to them by xfs_buf_attach_iodone(). We need to iterate the items on the
> - * callback list, mark the buffer as having no more callbacks and then push the
> - * buffer through IO completion processing.
> + * Inode buffer iodone callback function.
> */
> void
> -xfs_buf_iodone_callbacks(
> +xfs_buf_inode_iodone(
> struct xfs_buf *bp)
> {
> xfs_buf_run_callbacks(bp);
> - xfs_buf_ioend(bp);
> + xfs_buf_ioend_finish(bp);
> }
>
> /*
> - * Inode buffer iodone callback function.
> + * Dquot buffer iodone callback function.
> */
> void
> -xfs_buf_inode_iodone(
> +xfs_buf_dquot_iodone(
> struct xfs_buf *bp)
> {
> xfs_buf_run_callbacks(bp);
> @@ -1211,10 +1191,10 @@ xfs_buf_inode_iodone(
> }
>
> /*
> - * Dquot buffer iodone callback function.
> + * Dirty buffer iodone callback function.
> */
> void
> -xfs_buf_dquot_iodone(
> +xfs_buf_iodone(
> struct xfs_buf *bp)
> {
> xfs_buf_run_callbacks(bp);
> @@ -1229,7 +1209,7 @@ xfs_buf_dquot_iodone(
> * care of cleaning up the buffer itself.
> */
> void
> -xfs_buf_iodone(
> +xfs_buf_item_iodone(
> struct xfs_buf *bp,
> struct xfs_log_item *lip)
> {
Wow, that's a nasty diff. Another recent instance where 'git show
--patience' comes in handy... :)
BTW, is there a longer term need to have three separate iodone functions
here that do the same thing?
Brian
> diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
> index 27d13d29b5bbb..610cd00193289 100644
> --- a/fs/xfs/xfs_buf_item.h
> +++ b/fs/xfs/xfs_buf_item.h
> @@ -57,10 +57,10 @@ bool xfs_buf_item_dirty_format(struct xfs_buf_log_item *);
> void xfs_buf_attach_iodone(struct xfs_buf *,
> void(*)(struct xfs_buf *, struct xfs_log_item *),
> struct xfs_log_item *);
> -void xfs_buf_iodone_callbacks(struct xfs_buf *);
> -void xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *);
> +void xfs_buf_item_iodone(struct xfs_buf *, struct xfs_log_item *);
> void xfs_buf_inode_iodone(struct xfs_buf *);
> void xfs_buf_dquot_iodone(struct xfs_buf *);
> +void xfs_buf_iodone(struct xfs_buf *);
> bool xfs_buf_log_check_iovec(struct xfs_log_iovec *iovec);
>
> extern kmem_zone_t *xfs_buf_item_zone;
> diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
> index 93d62cb864c15..6752676b94fe7 100644
> --- a/fs/xfs/xfs_trans_buf.c
> +++ b/fs/xfs/xfs_trans_buf.c
> @@ -465,24 +465,17 @@ xfs_trans_dirty_buf(
>
> ASSERT(bp->b_transp == tp);
> ASSERT(bip != NULL);
> - ASSERT(bp->b_iodone == NULL ||
> - bp->b_iodone == xfs_buf_iodone_callbacks);
>
> /*
> * Mark the buffer as needing to be written out eventually,
> * and set its iodone function to remove the buffer's buf log
> * item from the AIL and free it when the buffer is flushed
> - * to disk. See xfs_buf_attach_iodone() for more details
> - * on li_cb and xfs_buf_iodone_callbacks().
> - * If we end up aborting this transaction, we trap this buffer
> - * inside the b_bdstrat callback so that this won't get written to
> - * disk.
> + * to disk.
> */
> bp->b_flags |= XBF_DONE;
>
> ASSERT(atomic_read(&bip->bli_refcount) > 0);
> - bp->b_iodone = xfs_buf_iodone_callbacks;
> - bip->bli_item.li_cb = xfs_buf_iodone;
> + bip->bli_item.li_cb = xfs_buf_item_iodone;
>
> /*
> * If we invalidated the buffer within this transaction, then
> @@ -651,7 +644,7 @@ xfs_trans_stale_inode_buf(
> ASSERT(atomic_read(&bip->bli_refcount) > 0);
>
> bip->bli_flags |= XFS_BLI_STALE_INODE;
> - bip->bli_item.li_cb = xfs_buf_iodone;
> + bip->bli_item.li_cb = xfs_buf_item_iodone;
> bp->b_flags |= _XBF_INODES;
> xfs_trans_buf_set_type(tp, bp, XFS_BLFT_DINO_BUF);
> }
> --
> 2.26.2.761.g0e0b3e54be
>
