On Fri, May 17, 2019 at 09:31:02AM +0200, Christoph Hellwig wrote:
> Just check if they are present first.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/xfs_bmap_item.c | 104 -------------------------------------
> fs/xfs/xfs_buf_item.c | 8 ---
> fs/xfs/xfs_dquot_item.c | 98 ----------------------------------
> fs/xfs/xfs_extfree_item.c | 104 -------------------------------------
> fs/xfs/xfs_icreate_item.c | 28 ----------
> fs/xfs/xfs_log_cil.c | 3 +-
> fs/xfs/xfs_refcount_item.c | 104 -------------------------------------
> fs/xfs/xfs_rmap_item.c | 104 -------------------------------------
> fs/xfs/xfs_trans.c | 21 +++++---
> fs/xfs/xfs_trans_ail.c | 2 +
> 10 files changed, 19 insertions(+), 557 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> index ce45f066995e..8e57df6d5581 100644
> --- a/fs/xfs/xfs_bmap_item.c
> +++ b/fs/xfs/xfs_bmap_item.c
...
> @@ -122,21 +113,6 @@ xfs_bui_item_unpin(
> xfs_bui_release(buip);
> }
>
> -/*
> - * BUI items have no locking or pushing. However, since BUIs are pulled from
> - * the AIL when their corresponding BUDs are committed to disk, their situation
> - * is very similar to being pinned. Return XFS_ITEM_PINNED so that the caller
> - * will eventually flush the log. This should help in getting the BUI out of
> - * the AIL.
> - */
> -STATIC uint
> -xfs_bui_item_push(
> - struct xfs_log_item *lip,
> - struct list_head *buffer_list)
> -{
> - return XFS_ITEM_PINNED;
> -}
> -
Nice cleanup overall. This removes a ton of duplicated and boilerplate
code. One thing I don't like is the loss of information around the use
of XFS_ITEM_PINNED in all these ->iop_push() calls associated with
intents. I'd almost rather see a generic xfs_intent_item_push() defined
somewhere and wire that up to these various calls. Short of that, could
we at least move some of the information from these comments to the push
call in xfsaild_push_item()? For example....
> /*
> * The BUI has been either committed or aborted if the transaction has been
> * cancelled. If the transaction was cancelled, an BUD isn't going to be
...
> diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
> index d3a4e89bf4a0..8509c4b59760 100644
> --- a/fs/xfs/xfs_trans_ail.c
> +++ b/fs/xfs/xfs_trans_ail.c
> @@ -347,6 +347,8 @@ xfsaild_push_item(
> if (XFS_TEST_ERROR(false, ailp->ail_mount, XFS_ERRTAG_LOG_ITEM_PIN))
> return XFS_ITEM_PINNED;
>
/*
* Consider the item pinned if a push callback is not defined so the
* caller will force the log. This should only happen for intent items
* as they are unpinned once the associated done item is committed to
* the on-disk log.
*/
Otherwise this looks fine.
Brian
> + if (!lip->li_ops->iop_push)
> + return XFS_ITEM_PINNED;
> return lip->li_ops->iop_push(lip, &ailp->ail_buf_list);
> }
>
> --
> 2.20.1
>
