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

Commit 8e123850 authored by Dave Chinner's avatar Dave Chinner Committed by Alex Elder
Browse files

xfs: remove stale parameter from ->iop_unpin method 



The staleness of a object being unpinned can be directly derived
from the object itself - there is no need to extract it from the
object then pass it as a parameter into IOP_UNPIN().

This means we can kill the XFS_LID_BUF_STALE flag - it is set,
checked and cleared in the same places XFS_BLI_STALE flag in the
xfs_buf_log_item so it is now redundant and hence safe to remove.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4aaf15d1

fs/xfs/quota/xfs_dquot_item.c

+6 −10
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ xfs_qm_dquot_logitem_pin( 
/* ARGSUSED */

STATIC void

xfs_qm_dquot_logitem_unpin(

	xfs_dq_logitem_t *logitem,

	int		  stale)

	xfs_dq_logitem_t *logitem)

{

	xfs_dquot_t *dqp = logitem->qli_dquot;
@@ -123,7 +122,7 @@ xfs_qm_dquot_logitem_unpin_remove( 
	xfs_dq_logitem_t *logitem,

	xfs_trans_t	 *tp)

{

	xfs_qm_dquot_logitem_unpin(logitem, 0);

	xfs_qm_dquot_logitem_unpin(logitem);

}



/*
@@ -329,8 +328,7 @@ static struct xfs_item_ops xfs_dquot_item_ops = { 
	.iop_format	= (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))

					xfs_qm_dquot_logitem_format,

	.iop_pin	= (void(*)(xfs_log_item_t*))xfs_qm_dquot_logitem_pin,

	.iop_unpin	= (void(*)(xfs_log_item_t*, int))

					xfs_qm_dquot_logitem_unpin,

	.iop_unpin	= (void(*)(xfs_log_item_t*))xfs_qm_dquot_logitem_unpin,

	.iop_unpin_remove = (void(*)(xfs_log_item_t*, xfs_trans_t*))

					xfs_qm_dquot_logitem_unpin_remove,

	.iop_trylock	= (uint(*)(xfs_log_item_t*))
@@ -425,7 +423,7 @@ xfs_qm_qoff_logitem_pin(xfs_qoff_logitem_t *qf) 
 */

/*ARGSUSED*/

STATIC void

xfs_qm_qoff_logitem_unpin(xfs_qoff_logitem_t *qf, int stale)

xfs_qm_qoff_logitem_unpin(xfs_qoff_logitem_t *qf)

{

	return;

}
@@ -536,8 +534,7 @@ static struct xfs_item_ops xfs_qm_qoffend_logitem_ops = { 
	.iop_format	= (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))

					xfs_qm_qoff_logitem_format,

	.iop_pin	= (void(*)(xfs_log_item_t*))xfs_qm_qoff_logitem_pin,

	.iop_unpin	= (void(*)(xfs_log_item_t* ,int))

					xfs_qm_qoff_logitem_unpin,

	.iop_unpin	= (void(*)(xfs_log_item_t*))xfs_qm_qoff_logitem_unpin,

	.iop_unpin_remove = (void(*)(xfs_log_item_t*,xfs_trans_t*))

					xfs_qm_qoff_logitem_unpin_remove,

	.iop_trylock	= (uint(*)(xfs_log_item_t*))xfs_qm_qoff_logitem_trylock,
@@ -558,8 +555,7 @@ static struct xfs_item_ops xfs_qm_qoff_logitem_ops = { 
	.iop_format	= (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))

					xfs_qm_qoff_logitem_format,

	.iop_pin	= (void(*)(xfs_log_item_t*))xfs_qm_qoff_logitem_pin,

	.iop_unpin	= (void(*)(xfs_log_item_t*, int))

					xfs_qm_qoff_logitem_unpin,

	.iop_unpin	= (void(*)(xfs_log_item_t*))xfs_qm_qoff_logitem_unpin,

	.iop_unpin_remove = (void(*)(xfs_log_item_t*,xfs_trans_t*))

					xfs_qm_qoff_logitem_unpin_remove,

	.iop_trylock	= (uint(*)(xfs_log_item_t*))xfs_qm_qoff_logitem_trylock,

fs/xfs/xfs_buf_item.c

+22 −28
Original line number Diff line number Diff line
@@ -372,12 +372,12 @@ xfs_buf_item_pin( 
 */

STATIC void

xfs_buf_item_unpin(

	xfs_buf_log_item_t	*bip,

	int			stale)

	xfs_buf_log_item_t	*bip)

{

	struct xfs_ail	*ailp;

	xfs_buf_t	*bp;

	int		freed;

	int		stale = bip->bli_flags & XFS_BLI_STALE;



	bp = bip->bli_buf;

	ASSERT(bp != NULL);
@@ -428,40 +428,34 @@ xfs_buf_item_unpin_remove( 
	xfs_buf_log_item_t	*bip,

	xfs_trans_t		*tp)

{

	xfs_buf_t		*bp;

	xfs_log_item_desc_t	*lidp;

	int			stale = 0;



	bp = bip->bli_buf;

	/*

	 * will xfs_buf_item_unpin() call xfs_buf_item_relse()?

	 */

	/* will xfs_buf_item_unpin() call xfs_buf_item_relse()? */

	if ((atomic_read(&bip->bli_refcount) == 1) &&

	    (bip->bli_flags & XFS_BLI_STALE)) {

		/*

		 * yes -- We can safely do some work here and then call

		 * buf_item_unpin to do the rest because we are

		 * are holding the buffer locked so no one else will be

		 * able to bump up the refcount. We have to remove the

		 * log item from the transaction as we are about to release

		 * our reference to the buffer. If we don't, the unlock that

		 * occurs later in the xfs_trans_uncommit() will try to

		 * reference the buffer which we no longer have a hold on.

		 */

		struct xfs_log_item_desc *lidp;



		ASSERT(XFS_BUF_VALUSEMA(bip->bli_buf) <= 0);

		trace_xfs_buf_item_unpin_stale(bip);



		/*

		 * yes -- clear the xaction descriptor in-use flag

		 * and free the chunk if required.  We can safely

		 * do some work here and then call buf_item_unpin

		 * to do the rest because if the if is true, then

		 * we are holding the buffer locked so no one else

		 * will be able to bump up the refcount.

		 */

		lidp = xfs_trans_find_item(tp, (xfs_log_item_t *)bip);

		stale = lidp->lid_flags & XFS_LID_BUF_STALE;

		xfs_trans_free_item(tp, lidp);



		/*

		 * Since the transaction no longer refers to the buffer,

		 * the buffer should no longer refer to the transaction.

		 * Since the transaction no longer refers to the buffer, the

		 * buffer should no longer refer to the transaction.

		 */

		XFS_BUF_SET_FSPRIVATE2(bp, NULL);

		XFS_BUF_SET_FSPRIVATE2(bip->bli_buf, NULL);

	}



	xfs_buf_item_unpin(bip, stale);



	return;

	xfs_buf_item_unpin(bip);

}



/*
@@ -675,7 +669,7 @@ static struct xfs_item_ops xfs_buf_item_ops = { 
	.iop_format	= (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))

					xfs_buf_item_format,

	.iop_pin	= (void(*)(xfs_log_item_t*))xfs_buf_item_pin,

	.iop_unpin	= (void(*)(xfs_log_item_t*, int))xfs_buf_item_unpin,

	.iop_unpin	= (void(*)(xfs_log_item_t*))xfs_buf_item_unpin,

	.iop_unpin_remove = (void(*)(xfs_log_item_t*, xfs_trans_t *))

					xfs_buf_item_unpin_remove,

	.iop_trylock	= (uint(*)(xfs_log_item_t*))xfs_buf_item_trylock,

fs/xfs/xfs_extfree_item.c

+4 −4
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ xfs_efi_item_pin(xfs_efi_log_item_t *efip) 
 */

/*ARGSUSED*/

STATIC void

xfs_efi_item_unpin(xfs_efi_log_item_t *efip, int stale)

xfs_efi_item_unpin(xfs_efi_log_item_t *efip)

{

	struct xfs_ail		*ailp = efip->efi_item.li_ailp;
@@ -224,7 +224,7 @@ static struct xfs_item_ops xfs_efi_item_ops = { 
	.iop_format	= (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))

					xfs_efi_item_format,

	.iop_pin	= (void(*)(xfs_log_item_t*))xfs_efi_item_pin,

	.iop_unpin	= (void(*)(xfs_log_item_t*, int))xfs_efi_item_unpin,

	.iop_unpin	= (void(*)(xfs_log_item_t*))xfs_efi_item_unpin,

	.iop_unpin_remove = (void(*)(xfs_log_item_t*, xfs_trans_t *))

					xfs_efi_item_unpin_remove,

	.iop_trylock	= (uint(*)(xfs_log_item_t*))xfs_efi_item_trylock,
@@ -425,7 +425,7 @@ xfs_efd_item_pin(xfs_efd_log_item_t *efdp) 
 */

/*ARGSUSED*/

STATIC void

xfs_efd_item_unpin(xfs_efd_log_item_t *efdp, int stale)

xfs_efd_item_unpin(xfs_efd_log_item_t *efdp)

{

	return;

}
@@ -515,7 +515,7 @@ static struct xfs_item_ops xfs_efd_item_ops = { 
	.iop_format	= (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))

					xfs_efd_item_format,

	.iop_pin	= (void(*)(xfs_log_item_t*))xfs_efd_item_pin,

	.iop_unpin	= (void(*)(xfs_log_item_t*, int))xfs_efd_item_unpin,

	.iop_unpin	= (void(*)(xfs_log_item_t*))xfs_efd_item_unpin,

	.iop_unpin_remove = (void(*)(xfs_log_item_t*, xfs_trans_t*))

					xfs_efd_item_unpin_remove,

	.iop_trylock	= (uint(*)(xfs_log_item_t*))xfs_efd_item_trylock,

fs/xfs/xfs_inode_item.c

+3 −4
Original line number Diff line number Diff line
@@ -557,8 +557,7 @@ xfs_inode_item_pin( 
/* ARGSUSED */

STATIC void

xfs_inode_item_unpin(

	xfs_inode_log_item_t	*iip,

	int			stale)

	xfs_inode_log_item_t	*iip)

{

	struct xfs_inode	*ip = iip->ili_inode;
@@ -574,7 +573,7 @@ xfs_inode_item_unpin_remove( 
	xfs_inode_log_item_t	*iip,

	xfs_trans_t		*tp)

{

	xfs_inode_item_unpin(iip, 0);

	xfs_inode_item_unpin(iip);

}



/*
@@ -840,7 +839,7 @@ static struct xfs_item_ops xfs_inode_item_ops = { 
	.iop_format	= (void(*)(xfs_log_item_t*, xfs_log_iovec_t*))

					xfs_inode_item_format,

	.iop_pin	= (void(*)(xfs_log_item_t*))xfs_inode_item_pin,

	.iop_unpin	= (void(*)(xfs_log_item_t*, int))xfs_inode_item_unpin,

	.iop_unpin	= (void(*)(xfs_log_item_t*))xfs_inode_item_unpin,

	.iop_unpin_remove = (void(*)(xfs_log_item_t*, xfs_trans_t*))

					xfs_inode_item_unpin_remove,

	.iop_trylock	= (uint(*)(xfs_log_item_t*))xfs_inode_item_trylock,

fs/xfs/xfs_trans.c

+1 −1
Original line number Diff line number Diff line
@@ -1451,6 +1451,6 @@ xfs_trans_chunk_committed( 
		 * flags, if anyone else stales the buffer we do not

		 * want to pay any attention to it.

		 */

		IOP_UNPIN(lip, lidp->lid_flags & XFS_LID_BUF_STALE);

		IOP_UNPIN(lip);

	}

}