Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57e80956 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Darrick J. Wong
Browse files

xfs: Rename xa_ elements to ail_ 



This is a simple rename, except that xa_ail becomes ail_head.

Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent ae23395d

fs/xfs/xfs_buf_item.c

+5 −5
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ xfs_buf_item_unpin( 
			list_del_init(&bp->b_li_list);

			bp->b_iodone = NULL;

		} else {

			spin_lock(&ailp->xa_lock);

			spin_lock(&ailp->ail_lock);

			xfs_trans_ail_delete(ailp, lip, SHUTDOWN_LOG_IO_ERROR);

			xfs_buf_item_relse(bp);

			ASSERT(bp->b_log_item == NULL);
@@ -1057,12 +1057,12 @@ xfs_buf_do_callbacks_fail( 
	lip = list_first_entry(&bp->b_li_list, struct xfs_log_item,

			li_bio_list);

	ailp = lip->li_ailp;

	spin_lock(&ailp->xa_lock);

	spin_lock(&ailp->ail_lock);

	list_for_each_entry(lip, &bp->b_li_list, li_bio_list) {

		if (lip->li_ops->iop_error)

			lip->li_ops->iop_error(lip, bp);

	}

	spin_unlock(&ailp->xa_lock);

	spin_unlock(&ailp->ail_lock);

}



static bool
@@ -1226,7 +1226,7 @@ xfs_buf_iodone( 
	 *

	 * Either way, AIL is useless if we're forcing a shutdown.

	 */

	spin_lock(&ailp->xa_lock);

	spin_lock(&ailp->ail_lock);

	xfs_trans_ail_delete(ailp, lip, SHUTDOWN_CORRUPT_INCORE);

	xfs_buf_item_free(BUF_ITEM(lip));

}
@@ -1246,7 +1246,7 @@ xfs_buf_resubmit_failed_buffers( 
	/*

	 * Clear XFS_LI_FAILED flag from all items before resubmit

	 *

	 * XFS_LI_FAILED set/clear is protected by xa_lock, caller  this

	 * XFS_LI_FAILED set/clear is protected by ail_lock, caller  this

	 * function already have it acquired

	 */

	list_for_each_entry(lip, &bp->b_li_list, li_bio_list)

fs/xfs/xfs_dquot.c

+2 −2
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ xfs_qm_dqflush_done( 
	     (lip->li_flags & XFS_LI_FAILED))) {



		/* xfs_trans_ail_delete() drops the AIL lock. */

		spin_lock(&ailp->xa_lock);

		spin_lock(&ailp->ail_lock);

		if (lip->li_lsn == qip->qli_flush_lsn) {

			xfs_trans_ail_delete(ailp, lip, SHUTDOWN_CORRUPT_INCORE);

		} else {
@@ -928,7 +928,7 @@ xfs_qm_dqflush_done( 
			 */

			if (lip->li_flags & XFS_LI_FAILED)

				xfs_clear_li_failed(lip);

			spin_unlock(&ailp->xa_lock);

			spin_unlock(&ailp->ail_lock);

		}

	}

fs/xfs/xfs_dquot_item.c

+6 −5
Original line number Diff line number Diff line
@@ -157,8 +157,9 @@ xfs_dquot_item_error( 
STATIC uint

xfs_qm_dquot_logitem_push(

	struct xfs_log_item	*lip,

	struct list_head	*buffer_list) __releases(&lip->li_ailp->xa_lock)

					      __acquires(&lip->li_ailp->xa_lock)

	struct list_head	*buffer_list)

		__releases(&lip->li_ailp->ail_lock)

		__acquires(&lip->li_ailp->ail_lock)

{

	struct xfs_dquot	*dqp = DQUOT_ITEM(lip)->qli_dquot;

	struct xfs_buf		*bp = lip->li_buf;
@@ -205,7 +206,7 @@ xfs_qm_dquot_logitem_push( 
		goto out_unlock;

	}



	spin_unlock(&lip->li_ailp->xa_lock);

	spin_unlock(&lip->li_ailp->ail_lock);



	error = xfs_qm_dqflush(dqp, &bp);

	if (error) {
@@ -217,7 +218,7 @@ xfs_qm_dquot_logitem_push( 
		xfs_buf_relse(bp);

	}



	spin_lock(&lip->li_ailp->xa_lock);

	spin_lock(&lip->li_ailp->ail_lock);

out_unlock:

	xfs_dqunlock(dqp);

	return rval;
@@ -400,7 +401,7 @@ xfs_qm_qoffend_logitem_committed( 
	 * Delete the qoff-start logitem from the AIL.

	 * xfs_trans_ail_delete() drops the AIL lock.

	 */

	spin_lock(&ailp->xa_lock);

	spin_lock(&ailp->ail_lock);

	xfs_trans_ail_delete(ailp, &qfs->qql_item, SHUTDOWN_LOG_IO_ERROR);



	kmem_free(qfs->qql_item.li_lv_shadow);

fs/xfs/xfs_inode_item.c

+11 −11
Original line number Diff line number Diff line
@@ -502,8 +502,8 @@ STATIC uint 
xfs_inode_item_push(

	struct xfs_log_item	*lip,

	struct list_head	*buffer_list)

		__releases(&lip->li_ailp->xa_lock)

		__acquires(&lip->li_ailp->xa_lock)

		__releases(&lip->li_ailp->ail_lock)

		__acquires(&lip->li_ailp->ail_lock)

{

	struct xfs_inode_log_item *iip = INODE_ITEM(lip);

	struct xfs_inode	*ip = iip->ili_inode;
@@ -562,7 +562,7 @@ xfs_inode_item_push( 
	ASSERT(iip->ili_fields != 0 || XFS_FORCED_SHUTDOWN(ip->i_mount));

	ASSERT(iip->ili_logged == 0 || XFS_FORCED_SHUTDOWN(ip->i_mount));



	spin_unlock(&lip->li_ailp->xa_lock);

	spin_unlock(&lip->li_ailp->ail_lock);



	error = xfs_iflush(ip, &bp);

	if (!error) {
@@ -571,7 +571,7 @@ xfs_inode_item_push( 
		xfs_buf_relse(bp);

	}



	spin_lock(&lip->li_ailp->xa_lock);

	spin_lock(&lip->li_ailp->ail_lock);

out_unlock:

	xfs_iunlock(ip, XFS_ILOCK_SHARED);

	return rval;
@@ -759,7 +759,7 @@ xfs_iflush_done( 
		bool			mlip_changed = false;



		/* this is an opencoded batch version of xfs_trans_ail_delete */

		spin_lock(&ailp->xa_lock);

		spin_lock(&ailp->ail_lock);

		list_for_each_entry(blip, &tmp, li_bio_list) {

			if (INODE_ITEM(blip)->ili_logged &&

			    blip->li_lsn == INODE_ITEM(blip)->ili_flush_lsn)
@@ -770,15 +770,15 @@ xfs_iflush_done( 
		}



		if (mlip_changed) {

			if (!XFS_FORCED_SHUTDOWN(ailp->xa_mount))

				xlog_assign_tail_lsn_locked(ailp->xa_mount);

			if (list_empty(&ailp->xa_ail))

				wake_up_all(&ailp->xa_empty);

			if (!XFS_FORCED_SHUTDOWN(ailp->ail_mount))

				xlog_assign_tail_lsn_locked(ailp->ail_mount);

			if (list_empty(&ailp->ail_head))

				wake_up_all(&ailp->ail_empty);

		}

		spin_unlock(&ailp->xa_lock);

		spin_unlock(&ailp->ail_lock);



		if (mlip_changed)

			xfs_log_space_wake(ailp->xa_mount);

			xfs_log_space_wake(ailp->ail_mount);

	}



	/*

fs/xfs/xfs_log.c

+3 −3
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ xlog_assign_tail_lsn_locked( 
	struct xfs_log_item	*lip;

	xfs_lsn_t		tail_lsn;



	assert_spin_locked(&mp->m_ail->xa_lock);

	assert_spin_locked(&mp->m_ail->ail_lock);



	/*

	 * To make sure we always have a valid LSN for the log tail we keep
@@ -1172,9 +1172,9 @@ xlog_assign_tail_lsn( 
{

	xfs_lsn_t		tail_lsn;



	spin_lock(&mp->m_ail->xa_lock);

	spin_lock(&mp->m_ail->ail_lock);

	tail_lsn = xlog_assign_tail_lsn_locked(mp);

	spin_unlock(&mp->m_ail->xa_lock);

	spin_unlock(&mp->m_ail->ail_lock);



	return tail_lsn;

}