On Wed, Apr 29, 2020 at 01:21:49PM -0400, Brian Foster wrote:
> Now that the functions and callers of
> xfs_trans_ail_[remove|delete]() have been fixed up appropriately,
> the only difference between the two is the shutdown behavior. There
> are only a few callers of the _remove() variant, so make the
> shutdown conditional on the parameter and combine the two functions.
>
> Suggested-by: Dave Chinner <david@xxxxxxxxxxxxx>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
Ok. I guess the rest of you like this broken out though tbh I found it
harder to figure out why and where we were going (and used git range
diff as a crutch). Not that I'm asking to have things put back. I got
through it already... :)
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_buf_item.c | 2 +-
> fs/xfs/xfs_dquot.c | 2 +-
> fs/xfs/xfs_dquot_item.c | 2 +-
> fs/xfs/xfs_inode_item.c | 2 +-
> fs/xfs/xfs_trans_ail.c | 27 ++++++++-------------------
> fs/xfs/xfs_trans_priv.h | 17 -----------------
> 6 files changed, 12 insertions(+), 40 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 47c547aca1f1..9e75e8d6042e 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -558,7 +558,7 @@ xfs_buf_item_put(
> * state.
> */
> if (aborted)
> - xfs_trans_ail_remove(lip);
> + xfs_trans_ail_delete(lip, 0);
> xfs_buf_item_relse(bip->bli_buf);
> return true;
> }
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 497a9dbef1c9..52e0f7245afc 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -1162,7 +1162,7 @@ xfs_qm_dqflush(
>
> out_abort:
> dqp->dq_flags &= ~XFS_DQ_DIRTY;
> - xfs_trans_ail_remove(lip);
> + xfs_trans_ail_delete(lip, 0);
> xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> out_unlock:
> xfs_dqfunlock(dqp);
> diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
> index 8bd46810d5db..349c92d26570 100644
> --- a/fs/xfs/xfs_dquot_item.c
> +++ b/fs/xfs/xfs_dquot_item.c
> @@ -343,7 +343,7 @@ xfs_qm_qoff_logitem_relse(
> ASSERT(test_bit(XFS_LI_IN_AIL, &lip->li_flags) ||
> test_bit(XFS_LI_ABORTED, &lip->li_flags) ||
> XFS_FORCED_SHUTDOWN(lip->li_mountp));
> - xfs_trans_ail_remove(lip);
> + xfs_trans_ail_delete(lip, 0);
> kmem_free(lip->li_lv_shadow);
> kmem_free(qoff);
> }
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index 0e449d0a3d5c..1a02058178d1 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -768,7 +768,7 @@ xfs_iflush_abort(
> xfs_inode_log_item_t *iip = ip->i_itemp;
>
> if (iip) {
> - xfs_trans_ail_remove(&iip->ili_item);
> + xfs_trans_ail_delete(&iip->ili_item, 0);
> iip->ili_logged = 0;
> /*
> * Clear the ili_last_fields bits now that we know that the
> diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
> index cfba691664c7..aa6a911e5c96 100644
> --- a/fs/xfs/xfs_trans_ail.c
> +++ b/fs/xfs/xfs_trans_ail.c
> @@ -842,25 +842,13 @@ xfs_ail_delete_one(
> }
>
> /**
> - * Remove a log items from the AIL
> + * Remove a log item from the AIL.
> *
> - * @xfs_trans_ail_delete_bulk takes an array of log items that all need to
> - * removed from the AIL. The caller is already holding the AIL lock, and done
> - * all the checks necessary to ensure the items passed in via @log_items are
> - * ready for deletion. This includes checking that the items are in the AIL.
> - *
> - * For each log item to be removed, unlink it from the AIL, clear the IN_AIL
> - * flag from the item and reset the item's lsn to 0. If we remove the first
> - * item in the AIL, update the log tail to match the new minimum LSN in the
> - * AIL.
> - *
> - * This function will not drop the AIL lock until all items are removed from
> - * the AIL to minimise the amount of lock traffic on the AIL. This does not
> - * greatly increase the AIL hold time, but does significantly reduce the amount
> - * of traffic on the lock, especially during IO completion.
> - *
> - * This function must be called with the AIL lock held. The lock is dropped
> - * before returning.
> + * For each log item to be removed, unlink it from the AIL, clear the IN_AIL
> + * flag from the item and reset the item's lsn to 0. If we remove the first item
> + * in the AIL, update the log tail to match the new minimum LSN in the AIL. If
> + * the item is not in the AIL, shut down if the caller has provided a shutdown
> + * type. Otherwise return quietly as this state is expected.
> */
> void
> xfs_trans_ail_delete(
> @@ -874,7 +862,7 @@ xfs_trans_ail_delete(
> spin_lock(&ailp->ail_lock);
> if (!test_bit(XFS_LI_IN_AIL, &lip->li_flags)) {
> spin_unlock(&ailp->ail_lock);
> - if (!XFS_FORCED_SHUTDOWN(mp)) {
> + if (shutdown_type && !XFS_FORCED_SHUTDOWN(mp)) {
> xfs_alert_tag(mp, XFS_PTAG_AILDELETE,
> "%s: attempting to delete a log item that is not in the AIL",
> __func__);
> @@ -883,6 +871,7 @@ xfs_trans_ail_delete(
> return;
> }
>
> + /* xfs_ail_update_finish() drops the AIL lock */
> tail_lsn = xfs_ail_delete_one(ailp, lip);
> xfs_ail_update_finish(ailp, tail_lsn);
> }
> diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
> index ab0a82e90825..cc046d9557ae 100644
> --- a/fs/xfs/xfs_trans_priv.h
> +++ b/fs/xfs/xfs_trans_priv.h
> @@ -96,23 +96,6 @@ void xfs_ail_update_finish(struct xfs_ail *ailp, xfs_lsn_t old_lsn)
> __releases(ailp->ail_lock);
> void xfs_trans_ail_delete(struct xfs_log_item *lip, int shutdown_type);
>
> -static inline void
> -xfs_trans_ail_remove(
> - struct xfs_log_item *lip)
> -{
> - struct xfs_ail *ailp = lip->li_ailp;
> - xfs_lsn_t tail_lsn;
> -
> - spin_lock(&ailp->ail_lock);
> - /* xfs_ail_update_finish() drops the AIL lock */
> - if (test_bit(XFS_LI_IN_AIL, &lip->li_flags)) {
> - tail_lsn = xfs_ail_delete_one(ailp, lip);
> - xfs_ail_update_finish(ailp, tail_lsn);
> - } else {
> - spin_unlock(&ailp->ail_lock);
> - }
> -}
> -
> void xfs_ail_push(struct xfs_ail *, xfs_lsn_t);
> void xfs_ail_push_all(struct xfs_ail *);
> void xfs_ail_push_all_sync(struct xfs_ail *);
> --
> 2.21.1
>
