Commit adadbeef authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

xfs: remove wrappers around b_fspriv 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAlex Elder <aelder@sgi.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent bf9d9013

fs/xfs/linux-2.6/xfs_buf.h

+0 −2
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ void xfs_buf_stale(struct xfs_buf *bp); 
#define XFS_BUF_SET_IODONE_FUNC(bp, func)	((bp)->b_iodone = (func))

#define XFS_BUF_CLR_IODONE_FUNC(bp)		((bp)->b_iodone = NULL)



#define XFS_BUF_FSPRIVATE(bp, type)		((type)(bp)->b_fspriv)

#define XFS_BUF_SET_FSPRIVATE(bp, val)		((bp)->b_fspriv = (void*)(val))

#define XFS_BUF_SET_START(bp)			do { } while (0)



#define XFS_BUF_PTR(bp)			(xfs_caddr_t)((bp)->b_addr)

fs/xfs/xfs_buf_item.c

+21 −30
Original line number Diff line number Diff line
@@ -90,13 +90,11 @@ xfs_buf_item_flush_log_debug( 
	uint		first,

	uint		last)

{

	xfs_buf_log_item_t	*bip;

	xfs_buf_log_item_t	*bip = bp->b_fspriv;

	uint			nbytes;



	bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t*);

	if ((bip == NULL) || (bip->bli_item.li_type != XFS_LI_BUF)) {

	if (bip == NULL || (bip->bli_item.li_type != XFS_LI_BUF))

		return;

	}



	ASSERT(bip->bli_logged != NULL);

	nbytes = last - first + 1;
@@ -408,7 +406,7 @@ xfs_buf_item_unpin( 
	int		stale = bip->bli_flags & XFS_BLI_STALE;

	int		freed;



	ASSERT(XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *) == bip);

	ASSERT(bp->b_fspriv == bip);

	ASSERT(atomic_read(&bip->bli_refcount) > 0);



	trace_xfs_buf_item_unpin(bip);
@@ -454,13 +452,13 @@ xfs_buf_item_unpin( 
		 */

		if (bip->bli_flags & XFS_BLI_STALE_INODE) {

			xfs_buf_do_callbacks(bp);

			XFS_BUF_SET_FSPRIVATE(bp, NULL);

			bp->b_fspriv = NULL;

			XFS_BUF_CLR_IODONE_FUNC(bp);

		} else {

			spin_lock(&ailp->xa_lock);

			xfs_trans_ail_delete(ailp, (xfs_log_item_t *)bip);

			xfs_buf_item_relse(bp);

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

			ASSERT(bp->b_fspriv == NULL);

		}

		xfs_buf_relse(bp);

	}
@@ -684,7 +682,7 @@ xfs_buf_item_init( 
	xfs_buf_t	*bp,

	xfs_mount_t	*mp)

{

	xfs_log_item_t		*lip;

	xfs_log_item_t		*lip = bp->b_fspriv;

	xfs_buf_log_item_t	*bip;

	int			chunks;

	int			map_size;
@@ -696,12 +694,8 @@ xfs_buf_item_init( 
	 * nothing to do here so return.

	 */

	ASSERT(bp->b_target->bt_mount == mp);

	if (XFS_BUF_FSPRIVATE(bp, void *) != NULL) {

		lip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);

		if (lip->li_type == XFS_LI_BUF) {

	if (lip != NULL && lip->li_type == XFS_LI_BUF)

		return;

		}

	}



	/*

	 * chunks is the number of XFS_BLF_CHUNK size pieces
@@ -740,11 +734,9 @@ xfs_buf_item_init( 
	 * Put the buf item into the list of items attached to the

	 * buffer at the front.

	 */

	if (XFS_BUF_FSPRIVATE(bp, void *) != NULL) {

		bip->bli_item.li_bio_list =

				XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);

	}

	XFS_BUF_SET_FSPRIVATE(bp, bip);

	if (bp->b_fspriv)

		bip->bli_item.li_bio_list = bp->b_fspriv;

	bp->b_fspriv = bip;

}
@@ -876,12 +868,11 @@ xfs_buf_item_relse( 


	trace_xfs_buf_item_relse(bp, _RET_IP_);



	bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t*);

	XFS_BUF_SET_FSPRIVATE(bp, bip->bli_item.li_bio_list);

	if ((XFS_BUF_FSPRIVATE(bp, void *) == NULL) &&

	    (XFS_BUF_IODONE_FUNC(bp) != NULL)) {

	bip = bp->b_fspriv;

	bp->b_fspriv = bip->bli_item.li_bio_list;

	if (bp->b_fspriv == NULL && XFS_BUF_IODONE_FUNC(bp) != NULL)

		XFS_BUF_CLR_IODONE_FUNC(bp);

	}



	xfs_buf_rele(bp);

	xfs_buf_item_free(bip);

}
@@ -908,12 +899,12 @@ xfs_buf_attach_iodone( 
	ASSERT(xfs_buf_islocked(bp));



	lip->li_cb = cb;

	if (XFS_BUF_FSPRIVATE(bp, void *) != NULL) {

		head_lip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);

	head_lip = bp->b_fspriv;

	if (head_lip) {

		lip->li_bio_list = head_lip->li_bio_list;

		head_lip->li_bio_list = lip;

	} else {

		XFS_BUF_SET_FSPRIVATE(bp, lip);

		bp->b_fspriv = lip;

	}



	ASSERT((XFS_BUF_IODONE_FUNC(bp) == xfs_buf_iodone_callbacks) ||
@@ -939,8 +930,8 @@ xfs_buf_do_callbacks( 
{

	struct xfs_log_item	*lip;



	while ((lip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *)) != NULL) {

		XFS_BUF_SET_FSPRIVATE(bp, lip->li_bio_list);

	while ((lip = bp->b_fspriv) != NULL) {

		bp->b_fspriv = lip->li_bio_list;

		ASSERT(lip->li_cb != NULL);

		/*

		 * Clear the next pointer so we don't have any
@@ -1026,7 +1017,7 @@ xfs_buf_iodone_callbacks( 


do_callbacks:

	xfs_buf_do_callbacks(bp);

	XFS_BUF_SET_FSPRIVATE(bp, NULL);

	bp->b_fspriv = NULL;

	XFS_BUF_CLR_IODONE_FUNC(bp);

	xfs_buf_ioend(bp, 0);

}

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1698,7 +1698,7 @@ xfs_ifree_cluster( 
		 * stale first, we will not attempt to lock them in the loop

		 * below as the XFS_ISTALE flag will be set.

		 */

		lip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);

		lip = bp->b_fspriv;

		while (lip) {

			if (lip->li_type == XFS_LI_INODE) {

				iip = (xfs_inode_log_item_t *)lip;
@@ -2811,7 +2811,7 @@ xfs_iflush_int( 
		 */

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



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

		ASSERT(bp->b_fspriv != NULL);

		ASSERT(XFS_BUF_IODONE_FUNC(bp) != NULL);

	} else {

		/*

fs/xfs/xfs_inode_item.c

+2 −2
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ xfs_iflush_done( 
	 * Scan the buffer IO completions for other inodes being completed and

	 * attach them to the current inode log item.

	 */

	blip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);

	blip = bp->b_fspriv;

	prev = NULL;

	while (blip != NULL) {

		if (lip->li_cb != xfs_iflush_done) {
@@ -886,7 +886,7 @@ xfs_iflush_done( 
		/* remove from list */

		next = blip->li_bio_list;

		if (!prev) {

			XFS_BUF_SET_FSPRIVATE(bp, next);

			bp->b_fspriv = next;

		} else {

			prev->li_bio_list = next;

		}

fs/xfs/xfs_log.c

+6 −11
Original line number Diff line number Diff line
@@ -871,13 +871,9 @@ xlog_space_left( 
void

xlog_iodone(xfs_buf_t *bp)

{

	xlog_in_core_t	*iclog;

	xlog_t		*l;

	int		aborted;



	iclog = XFS_BUF_FSPRIVATE(bp, xlog_in_core_t *);

	aborted = 0;

	l = iclog->ic_log;

	xlog_in_core_t	*iclog = bp->b_fspriv;

	xlog_t		*l = iclog->ic_log;

	int		aborted = 0;



	/*

	 * Race to shutdown the filesystem if we see an error.
@@ -1249,9 +1245,8 @@ STATIC int 
xlog_bdstrat(

	struct xfs_buf		*bp)

{

	struct xlog_in_core	*iclog;

	struct xlog_in_core	*iclog = bp->b_fspriv;



	iclog = XFS_BUF_FSPRIVATE(bp, xlog_in_core_t *);

	if (iclog->ic_state & XLOG_STATE_IOERROR) {

		XFS_BUF_ERROR(bp, EIO);

		XFS_BUF_STALE(bp);
@@ -1358,7 +1353,7 @@ xlog_sync(xlog_t *log, 
		iclog->ic_bwritecnt = 1;

	}

	XFS_BUF_SET_COUNT(bp, count);

	XFS_BUF_SET_FSPRIVATE(bp, iclog);	/* save for later */

	bp->b_fspriv = iclog;

	XFS_BUF_ZEROFLAGS(bp);

	XFS_BUF_BUSY(bp);

	XFS_BUF_ASYNC(bp);
@@ -1405,7 +1400,7 @@ xlog_sync(xlog_t *log, 
		XFS_BUF_SET_ADDR(bp, 0);	     /* logical 0 */

		XFS_BUF_SET_PTR(bp, (xfs_caddr_t)((__psint_t)&(iclog->ic_header)+

					    (__psint_t)count), split);

		XFS_BUF_SET_FSPRIVATE(bp, iclog);

		bp->b_fspriv = iclog;

		XFS_BUF_ZEROFLAGS(bp);

		XFS_BUF_BUSY(bp);

		XFS_BUF_ASYNC(bp);