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

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

xfs: remove xfs_buf wrappers 



Stop having two different names for many buffer functions and use
the more descriptive xfs_buf_* names directly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 6c77b0ea

fs/xfs/linux-2.6/xfs_buf.c

+9 −10
Original line number Diff line number Diff line
@@ -652,8 +652,7 @@ void 
xfs_buf_readahead(

	xfs_buftarg_t		*target,

	xfs_off_t		ioff,

	size_t			isize,

	xfs_buf_flags_t		flags)

	size_t			isize)

{

	struct backing_dev_info *bdi;
@@ -661,8 +660,8 @@ xfs_buf_readahead( 
	if (bdi_read_congested(bdi))

		return;



	flags |= (XBF_TRYLOCK|XBF_ASYNC|XBF_READ_AHEAD);

	xfs_buf_read(target, ioff, isize, flags);

	xfs_buf_read(target, ioff, isize,

		     XBF_TRYLOCK|XBF_ASYNC|XBF_READ_AHEAD|XBF_DONT_BLOCK);

}



/*
@@ -691,7 +690,7 @@ xfs_buf_read_uncached( 
	XFS_BUF_BUSY(bp);



	xfsbdstrat(mp, bp);

	error = xfs_iowait(bp);

	error = xfs_buf_iowait(bp);

	if (error || bp->b_error) {

		xfs_buf_relse(bp);

		return NULL;
@@ -1073,7 +1072,7 @@ xfs_bdwrite( 


/*

 * Called when we want to stop a buffer from getting written or read.

 * We attach the EIO error, muck with its flags, and call biodone

 * We attach the EIO error, muck with its flags, and call xfs_buf_ioend

 * so that the proper iodone callbacks get called.

 */

STATIC int
@@ -1090,21 +1089,21 @@ xfs_bioerror( 
	XFS_BUF_ERROR(bp, EIO);



	/*

	 * We're calling biodone, so delete XBF_DONE flag.

	 * We're calling xfs_buf_ioend, so delete XBF_DONE flag.

	 */

	XFS_BUF_UNREAD(bp);

	XFS_BUF_UNDELAYWRITE(bp);

	XFS_BUF_UNDONE(bp);

	XFS_BUF_STALE(bp);



	xfs_biodone(bp);

	xfs_buf_ioend(bp, 0);



	return EIO;

}



/*

 * Same as xfs_bioerror, except that we are releasing the buffer

 * here ourselves, and avoiding the biodone call.

 * here ourselves, and avoiding the xfs_buf_ioend call.

 * This is meant for userdata errors; metadata bufs come with

 * iodone functions attached, so that we can track down errors.

 */
@@ -1938,7 +1937,7 @@ xfs_flush_buftarg( 
			bp = list_first_entry(&wait_list, struct xfs_buf, b_list);



			list_del_init(&bp->b_list);

			xfs_iowait(bp);

			xfs_buf_iowait(bp);

			xfs_buf_relse(bp);

		}

	}

fs/xfs/linux-2.6/xfs_buf.h

+3 −17
Original line number Diff line number Diff line
@@ -218,8 +218,7 @@ extern xfs_buf_t *xfs_buf_get_empty(size_t, xfs_buftarg_t *); 
extern xfs_buf_t *xfs_buf_get_uncached(struct xfs_buftarg *, size_t, int);

extern int xfs_buf_associate_memory(xfs_buf_t *, void *, size_t);

extern void xfs_buf_hold(xfs_buf_t *);

extern void xfs_buf_readahead(xfs_buftarg_t *, xfs_off_t, size_t,

				xfs_buf_flags_t);

extern void xfs_buf_readahead(xfs_buftarg_t *, xfs_off_t, size_t);

struct xfs_buf *xfs_buf_read_uncached(struct xfs_mount *mp,

				struct xfs_buftarg *target,

				xfs_daddr_t daddr, size_t length, int flags);
@@ -247,6 +246,8 @@ extern int xfs_buf_iorequest(xfs_buf_t *); 
extern int xfs_buf_iowait(xfs_buf_t *);

extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *,

				xfs_buf_rw_t);

#define xfs_buf_zero(bp, off, len) \

	    xfs_buf_iomove((bp), (off), (len), NULL, XBRW_ZERO)



static inline int xfs_buf_geterror(xfs_buf_t *bp)

{
@@ -359,21 +360,6 @@ static inline void xfs_buf_relse(xfs_buf_t *bp) 
	xfs_buf_rele(bp);

}



#define xfs_biodone(bp)		xfs_buf_ioend(bp, 0)



#define xfs_biomove(bp, off, len, data, rw) \

	    xfs_buf_iomove((bp), (off), (len), (data), \

		((rw) == XBF_WRITE) ? XBRW_WRITE : XBRW_READ)



#define xfs_biozero(bp, off, len) \

	    xfs_buf_iomove((bp), (off), (len), NULL, XBRW_ZERO)



#define xfs_iowait(bp)	xfs_buf_iowait(bp)



#define xfs_baread(target, rablkno, ralen)  \

	xfs_buf_readahead((target), (rablkno), (ralen), XBF_DONT_BLOCK)





/*

 *	Handling of buftargs.

 */

fs/xfs/linux-2.6/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ xfs_barrier_test( 
	XFS_BUF_ORDERED(sbp);



	xfsbdstrat(mp, sbp);

	error = xfs_iowait(sbp);

	error = xfs_buf_iowait(sbp);



	/*

	 * Clear all the flags we set and possible error state in the

fs/xfs/quota/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ xfs_qm_dqiterate( 
				rablkcnt =  map[i+1].br_blockcount;

				rablkno = map[i+1].br_startblock;

				while (rablkcnt--) {

					xfs_baread(mp->m_ddev_targp,

					xfs_buf_readahead(mp->m_ddev_targp,

					       XFS_FSB_TO_DADDR(mp, rablkno),

					       mp->m_quotainfo->qi_dqchunklen);

					rablkno++;

fs/xfs/xfs_attr.c

+3 −3
Original line number Diff line number Diff line
@@ -1986,7 +1986,7 @@ xfs_attr_rmtval_get(xfs_da_args_t *args) 


			tmp = (valuelen < XFS_BUF_SIZE(bp))

				? valuelen : XFS_BUF_SIZE(bp);

			xfs_biomove(bp, 0, tmp, dst, XBF_READ);

			xfs_buf_iomove(bp, 0, tmp, dst, XBRW_READ);

			xfs_buf_relse(bp);

			dst += tmp;

			valuelen -= tmp;
@@ -2116,9 +2116,9 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) 


		tmp = (valuelen < XFS_BUF_SIZE(bp)) ? valuelen :

							XFS_BUF_SIZE(bp);

		xfs_biomove(bp, 0, tmp, src, XBF_WRITE);

		xfs_buf_iomove(bp, 0, tmp, src, XBRW_WRITE);

		if (tmp < XFS_BUF_SIZE(bp))

			xfs_biozero(bp, tmp, XFS_BUF_SIZE(bp) - tmp);

			xfs_buf_zero(bp, tmp, XFS_BUF_SIZE(bp) - tmp);

		if ((error = xfs_bwrite(mp, bp))) {/* GROT: NOTE: synchronous write */

			return (error);

		}