On Wed, Apr 29, 2020 at 01:21:48PM -0400, Brian Foster wrote:
> The shutdown parameter of xfs_trans_ail_remove() is no longer used.
> The remaining callers use it for items that legitimately might not
> be in the AIL or from contexts where AIL state has already been
> checked. Remove the unnecessary parameter and fix up the callers.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
Looks ok,
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 | 6 +-----
> fs/xfs/xfs_trans_priv.h | 3 +--
> 5 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 06e306b49283..47c547aca1f1 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, SHUTDOWN_LOG_IO_ERROR);
> + xfs_trans_ail_remove(lip);
> xfs_buf_item_relse(bip->bli_buf);
> return true;
> }
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 5fb65f43b980..497a9dbef1c9 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, SHUTDOWN_CORRUPT_INCORE);
> + xfs_trans_ail_remove(lip);
> 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 5a7808299a32..8bd46810d5db 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, SHUTDOWN_LOG_IO_ERROR);
> + xfs_trans_ail_remove(lip);
> 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 1d4d256a2e96..0e449d0a3d5c 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -768,11 +768,7 @@ xfs_iflush_abort(
> xfs_inode_log_item_t *iip = ip->i_itemp;
>
> if (iip) {
> - if (test_bit(XFS_LI_IN_AIL, &iip->ili_item.li_flags)) {
> - xfs_trans_ail_remove(&iip->ili_item,
> - stale ? SHUTDOWN_LOG_IO_ERROR :
> - SHUTDOWN_CORRUPT_INCORE);
> - }
> + xfs_trans_ail_remove(&iip->ili_item);
> iip->ili_logged = 0;
> /*
> * Clear the ili_last_fields bits now that we know that the
> diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
> index e4362fb8d483..ab0a82e90825 100644
> --- a/fs/xfs/xfs_trans_priv.h
> +++ b/fs/xfs/xfs_trans_priv.h
> @@ -98,8 +98,7 @@ 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,
> - int shutdown_type)
> + struct xfs_log_item *lip)
> {
> struct xfs_ail *ailp = lip->li_ailp;
> xfs_lsn_t tail_lsn;
> --
> 2.21.1
>
