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

Commit ca30b2a7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: give li_cb callbacks the correct prototype 



Stop the function pointer casting madness and give all the li_cb instances
correct prototype.

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

fs/xfs/quota/xfs_dquot.c

+43 −48
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ 
   flush lock - ditto.

*/



STATIC void		xfs_qm_dqflush_done(xfs_buf_t *, xfs_dq_logitem_t *);



#ifdef DEBUG

xfs_buftarg_t *xfs_dqerror_target;

int xfs_do_dqerror;
@@ -1131,6 +1129,46 @@ xfs_qm_dqrele( 
	xfs_qm_dqput(dqp);

}



/*

 * This is the dquot flushing I/O completion routine.  It is called

 * from interrupt level when the buffer containing the dquot is

 * flushed to disk.  It is responsible for removing the dquot logitem

 * from the AIL if it has not been re-logged, and unlocking the dquot's

 * flush lock. This behavior is very similar to that of inodes..

 */

STATIC void

xfs_qm_dqflush_done(

	struct xfs_buf		*bp,

	struct xfs_log_item	*lip)

{

	xfs_dq_logitem_t	*qip = (struct xfs_dq_logitem *)lip;

	xfs_dquot_t		*dqp = qip->qli_dquot;

	struct xfs_ail		*ailp = lip->li_ailp;



	/*

	 * We only want to pull the item from the AIL if its

	 * location in the log has not changed since we started the flush.

	 * Thus, we only bother if the dquot's lsn has

	 * not changed. First we check the lsn outside the lock

	 * since it's cheaper, and then we recheck while

	 * holding the lock before removing the dquot from the AIL.

	 */

	if ((lip->li_flags & XFS_LI_IN_AIL) &&

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



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

		spin_lock(&ailp->xa_lock);

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

			xfs_trans_ail_delete(ailp, lip);

		else

			spin_unlock(&ailp->xa_lock);

	}



	/*

	 * Release the dq's flush lock since we're done with it.

	 */

	xfs_dqfunlock(dqp);

}



/*

 * Write a modified dquot to disk.
@@ -1212,8 +1250,9 @@ xfs_qm_dqflush( 
	 * Attach an iodone routine so that we can remove this dquot from the

	 * AIL and release the flush lock once the dquot is synced to disk.

	 */

	xfs_buf_attach_iodone(bp, (void(*)(xfs_buf_t *, xfs_log_item_t *))

			      xfs_qm_dqflush_done, &(dqp->q_logitem.qli_item));

	xfs_buf_attach_iodone(bp, xfs_qm_dqflush_done,

				  &dqp->q_logitem.qli_item);



	/*

	 * If the buffer is pinned then push on the log so we won't

	 * get stuck waiting in the write for too long.
@@ -1237,50 +1276,6 @@ xfs_qm_dqflush( 


}



/*

 * This is the dquot flushing I/O completion routine.  It is called

 * from interrupt level when the buffer containing the dquot is

 * flushed to disk.  It is responsible for removing the dquot logitem

 * from the AIL if it has not been re-logged, and unlocking the dquot's

 * flush lock. This behavior is very similar to that of inodes..

 */

/*ARGSUSED*/

STATIC void

xfs_qm_dqflush_done(

	xfs_buf_t		*bp,

	xfs_dq_logitem_t	*qip)

{

	xfs_dquot_t		*dqp;

	struct xfs_ail		*ailp;



	dqp = qip->qli_dquot;

	ailp = qip->qli_item.li_ailp;



	/*

	 * We only want to pull the item from the AIL if its

	 * location in the log has not changed since we started the flush.

	 * Thus, we only bother if the dquot's lsn has

	 * not changed. First we check the lsn outside the lock

	 * since it's cheaper, and then we recheck while

	 * holding the lock before removing the dquot from the AIL.

	 */

	if ((qip->qli_item.li_flags & XFS_LI_IN_AIL) &&

	    qip->qli_item.li_lsn == qip->qli_flush_lsn) {



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

		spin_lock(&ailp->xa_lock);

		if (qip->qli_item.li_lsn == qip->qli_flush_lsn)

			xfs_trans_ail_delete(ailp, (xfs_log_item_t*)qip);

		else

			spin_unlock(&ailp->xa_lock);

	}



	/*

	 * Release the dq's flush lock since we're done with it.

	 */

	xfs_dqfunlock(dqp);

}



int

xfs_qm_dqlock_nowait(

	xfs_dquot_t *dqp)

fs/xfs/xfs_buf_item.c

+6 −7
Original line number Diff line number Diff line
@@ -1079,15 +1079,14 @@ xfs_buf_error_relse( 
 * It is called by xfs_buf_iodone_callbacks() above which will take

 * care of cleaning up the buffer itself.

 */

/* ARGSUSED */

void

xfs_buf_iodone(

	xfs_buf_t		*bp,

	xfs_buf_log_item_t	*bip)

	struct xfs_buf		*bp,

	struct xfs_log_item	*lip)

{

	struct xfs_ail		*ailp = bip->bli_item.li_ailp;

	struct xfs_ail		*ailp = lip->li_ailp;



	ASSERT(bip->bli_buf == bp);

	ASSERT(BUF_ITEM(lip)->bli_buf == bp);



	xfs_buf_rele(bp);
@@ -1101,6 +1100,6 @@ xfs_buf_iodone( 
	 * Either way, AIL is useless if we're forcing a shutdown.

	 */

	spin_lock(&ailp->xa_lock);

	xfs_trans_ail_delete(ailp, (xfs_log_item_t *)bip);

	xfs_buf_item_free(bip);

	xfs_trans_ail_delete(ailp, lip);

	xfs_buf_item_free(BUF_ITEM(lip));

}

fs/xfs/xfs_buf_item.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void xfs_buf_attach_iodone(struct xfs_buf *, 
			      void(*)(struct xfs_buf *, xfs_log_item_t *),

			      xfs_log_item_t *);

void	xfs_buf_iodone_callbacks(struct xfs_buf *);

void	xfs_buf_iodone(struct xfs_buf *, xfs_buf_log_item_t *);

void	xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *);



#ifdef XFS_TRANS_DEBUG

void

fs/xfs/xfs_inode.c

+4 −6
Original line number Diff line number Diff line
@@ -1981,7 +1981,7 @@ xfs_ifree_cluster( 
			if (lip->li_type == XFS_LI_INODE) {

				iip = (xfs_inode_log_item_t *)lip;

				ASSERT(iip->ili_logged == 1);

				lip->li_cb = (void(*)(xfs_buf_t*,xfs_log_item_t*)) xfs_istale_done;

				lip->li_cb = xfs_istale_done;

				xfs_trans_ail_copy_lsn(mp->m_ail,

							&iip->ili_flush_lsn,

							&iip->ili_item.li_lsn);
@@ -2051,9 +2051,8 @@ xfs_ifree_cluster( 
			xfs_trans_ail_copy_lsn(mp->m_ail, &iip->ili_flush_lsn,

						&iip->ili_item.li_lsn);



			xfs_buf_attach_iodone(bp,

				(void(*)(xfs_buf_t*,xfs_log_item_t*))

				xfs_istale_done, (xfs_log_item_t *)iip);

			xfs_buf_attach_iodone(bp, xfs_istale_done,

						  &iip->ili_item);



			if (ip != free_ip)

				xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -3065,8 +3064,7 @@ xfs_iflush_int( 
		 * and unlock the inode's flush lock when the inode is

		 * completely written to disk.

		 */

		xfs_buf_attach_iodone(bp, (void(*)(xfs_buf_t*,xfs_log_item_t*))

				      xfs_iflush_done, (xfs_log_item_t *)iip);

		xfs_buf_attach_iodone(bp, xfs_iflush_done, &iip->ili_item);



		ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);

		ASSERT(XFS_BUF_IODONE_FUNC(bp) != NULL);

fs/xfs/xfs_inode_item.c

+10 −13
Original line number Diff line number Diff line
@@ -867,14 +867,14 @@ xfs_inode_item_destroy( 
 * from the AIL if it has not been re-logged, and unlocking the inode's

 * flush lock.

 */

/*ARGSUSED*/

void

xfs_iflush_done(

	xfs_buf_t		*bp,

	xfs_inode_log_item_t	*iip)

	struct xfs_buf		*bp,

	struct xfs_log_item	*lip)

{

	struct xfs_inode_log_item *iip = INODE_ITEM(lip);

	xfs_inode_t		*ip = iip->ili_inode;

	struct xfs_ail		*ailp = iip->ili_item.li_ailp;

	struct xfs_ail		*ailp = lip->li_ailp;



	/*

	 * We only want to pull the item from the AIL if it is
@@ -885,12 +885,11 @@ xfs_iflush_done( 
	 * the lock since it's cheaper, and then we recheck while

	 * holding the lock before removing the inode from the AIL.

	 */

	if (iip->ili_logged &&

	    (iip->ili_item.li_lsn == iip->ili_flush_lsn)) {

	if (iip->ili_logged && lip->li_lsn == iip->ili_flush_lsn) {

		spin_lock(&ailp->xa_lock);

		if (iip->ili_item.li_lsn == iip->ili_flush_lsn) {

		if (lip->li_lsn == iip->ili_flush_lsn) {

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

			xfs_trans_ail_delete(ailp, (xfs_log_item_t*)iip);

			xfs_trans_ail_delete(ailp, lip);

		} else {

			spin_unlock(&ailp->xa_lock);

		}
@@ -908,8 +907,6 @@ xfs_iflush_done( 
	 * Release the inode's flush lock since we're done with it.

	 */

	xfs_ifunlock(ip);



	return;

}



/*
@@ -959,10 +956,10 @@ xfs_iflush_abort( 


void

xfs_istale_done(

	xfs_buf_t		*bp,

	xfs_inode_log_item_t	*iip)

	struct xfs_buf		*bp,

	struct xfs_log_item	*lip)

{

	xfs_iflush_abort(iip->ili_inode);

	xfs_iflush_abort(INODE_ITEM(lip)->ili_inode);

}



/*