Commit 6af0479d authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

xfs: drop unused shutdown parameter from xfs_trans_ail_remove() 



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: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 65587929

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_dquot_item.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

fs/xfs/xfs_inode_item.c

+1 −5
Original line number Diff line number Diff line
@@ -768,11 +768,7 @@ xfs_iflush_abort( 
	struct xfs_inode_log_item *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

fs/xfs/xfs_trans_priv.h

+1 −2
Original line number Diff line number Diff line
@@ -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;