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

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

xfs: simplify xfs_buf_get / xfs_buf_read interfaces 



Currently the low-level buffer cache interfaces are highly confusing
as we have a _flags variant of each that does actually respect the
flags, and one without _flags which has a flags argument that gets
ignored and overriden with a default set.  Given that very few places
use the default arguments get rid of the duplication and convert all
callers to pass the flags explicitly.  Also remove the now confusing
_flags postfix.

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

fs/xfs/linux-2.6/xfs_buf.c

+4 −4
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ _xfs_buf_find( 
 *	although backing storage may not be.

 */

xfs_buf_t *

xfs_buf_get_flags(

xfs_buf_get(

	xfs_buftarg_t		*target,/* target for buffer		*/

	xfs_off_t		ioff,	/* starting offset of range	*/

	size_t			isize,	/* length of range		*/
@@ -661,7 +661,7 @@ _xfs_buf_read( 
}



xfs_buf_t *

xfs_buf_read_flags(

xfs_buf_read(

	xfs_buftarg_t		*target,

	xfs_off_t		ioff,

	size_t			isize,
@@ -671,7 +671,7 @@ xfs_buf_read_flags( 


	flags |= XBF_READ;



	bp = xfs_buf_get_flags(target, ioff, isize, flags);

	bp = xfs_buf_get(target, ioff, isize, flags);

	if (bp) {

		if (!XFS_BUF_ISDONE(bp)) {

			XB_TRACE(bp, "read", (unsigned long)flags);
@@ -718,7 +718,7 @@ xfs_buf_readahead( 
		return;



	flags |= (XBF_TRYLOCK|XBF_ASYNC|XBF_READ_AHEAD);

	xfs_buf_read_flags(target, ioff, isize, flags);

	xfs_buf_read(target, ioff, isize, flags);

}



xfs_buf_t *

fs/xfs/linux-2.6/xfs_buf.h

+2 −7
Original line number Diff line number Diff line
@@ -186,15 +186,10 @@ extern xfs_buf_t *_xfs_buf_find(xfs_buftarg_t *, xfs_off_t, size_t, 
#define xfs_incore(buftarg,blkno,len,lockit) \

	_xfs_buf_find(buftarg, blkno ,len, lockit, NULL)



extern xfs_buf_t *xfs_buf_get_flags(xfs_buftarg_t *, xfs_off_t, size_t,

extern xfs_buf_t *xfs_buf_get(xfs_buftarg_t *, xfs_off_t, size_t,

				xfs_buf_flags_t);

#define xfs_buf_get(target, blkno, len, flags) \

	xfs_buf_get_flags((target), (blkno), (len), XBF_LOCK | XBF_MAPPED)



extern xfs_buf_t *xfs_buf_read_flags(xfs_buftarg_t *, xfs_off_t, size_t,

extern xfs_buf_t *xfs_buf_read(xfs_buftarg_t *, xfs_off_t, size_t,

				xfs_buf_flags_t);

#define xfs_buf_read(target, blkno, len, flags) \

	xfs_buf_read_flags((target), (blkno), (len), XBF_LOCK | XBF_MAPPED)



extern xfs_buf_t *xfs_buf_get_empty(size_t, xfs_buftarg_t *);

extern xfs_buf_t *xfs_buf_get_noaddr(size_t, xfs_buftarg_t *);

fs/xfs/xfs_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -2143,7 +2143,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) 
		dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock),

		blkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount);



		bp = xfs_buf_get_flags(mp->m_ddev_targp, dblkno, blkcnt,

		bp = xfs_buf_get(mp->m_ddev_targp, dblkno, blkcnt,

				 XFS_BUF_LOCK | XBF_DONT_BLOCK);

		ASSERT(bp);

		ASSERT(!XFS_BUF_GETERROR(bp));

fs/xfs/xfs_fsops.c

+13 −10
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ xfs_growfs_data_private( 
		 */

		bp = xfs_buf_get(mp->m_ddev_targp,

				 XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),

				  XFS_FSS_TO_BB(mp, 1), 0);

				 XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);

		agf = XFS_BUF_TO_AGF(bp);

		memset(agf, 0, mp->m_sb.sb_sectsize);

		agf->agf_magicnum = cpu_to_be32(XFS_AGF_MAGIC);
@@ -234,7 +234,7 @@ xfs_growfs_data_private( 
		 */

		bp = xfs_buf_get(mp->m_ddev_targp,

				 XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),

				  XFS_FSS_TO_BB(mp, 1), 0);

				 XFS_FSS_TO_BB(mp, 1), XBF_LOCK | XBF_MAPPED);

		agi = XFS_BUF_TO_AGI(bp);

		memset(agi, 0, mp->m_sb.sb_sectsize);

		agi->agi_magicnum = cpu_to_be32(XFS_AGI_MAGIC);
@@ -258,7 +258,8 @@ xfs_growfs_data_private( 
		 */

		bp = xfs_buf_get(mp->m_ddev_targp,

				 XFS_AGB_TO_DADDR(mp, agno, XFS_BNO_BLOCK(mp)),

			BTOBB(mp->m_sb.sb_blocksize), 0);

				 BTOBB(mp->m_sb.sb_blocksize),

				 XBF_LOCK | XBF_MAPPED);

		block = XFS_BUF_TO_BLOCK(bp);

		memset(block, 0, mp->m_sb.sb_blocksize);

		block->bb_magic = cpu_to_be32(XFS_ABTB_MAGIC);
@@ -279,7 +280,8 @@ xfs_growfs_data_private( 
		 */

		bp = xfs_buf_get(mp->m_ddev_targp,

				 XFS_AGB_TO_DADDR(mp, agno, XFS_CNT_BLOCK(mp)),

			BTOBB(mp->m_sb.sb_blocksize), 0);

				 BTOBB(mp->m_sb.sb_blocksize),

				 XBF_LOCK | XBF_MAPPED);

		block = XFS_BUF_TO_BLOCK(bp);

		memset(block, 0, mp->m_sb.sb_blocksize);

		block->bb_magic = cpu_to_be32(XFS_ABTC_MAGIC);
@@ -301,7 +303,8 @@ xfs_growfs_data_private( 
		 */

		bp = xfs_buf_get(mp->m_ddev_targp,

				 XFS_AGB_TO_DADDR(mp, agno, XFS_IBT_BLOCK(mp)),

			BTOBB(mp->m_sb.sb_blocksize), 0);

				 BTOBB(mp->m_sb.sb_blocksize),

				 XBF_LOCK | XBF_MAPPED);

		block = XFS_BUF_TO_BLOCK(bp);

		memset(block, 0, mp->m_sb.sb_blocksize);

		block->bb_magic = cpu_to_be32(XFS_IBT_MAGIC);

fs/xfs/xfs_log_recover.c

+8 −8
Original line number Diff line number Diff line
@@ -2206,6 +2206,7 @@ xlog_recover_do_buffer_trans( 
	xfs_daddr_t		blkno;

	int			len;

	ushort			flags;

	uint			buf_flags;



	buf_f = (xfs_buf_log_format_t *)item->ri_buf[0].i_addr;
@@ -2246,12 +2247,11 @@ xlog_recover_do_buffer_trans( 
	}



	mp = log->l_mp;

	if (flags & XFS_BLI_INODE_BUF) {

		bp = xfs_buf_read_flags(mp->m_ddev_targp, blkno, len,

								XFS_BUF_LOCK);

	} else {

		bp = xfs_buf_read(mp->m_ddev_targp, blkno, len, 0);

	}

	buf_flags = XFS_BUF_LOCK;

	if (!(flags & XFS_BLI_INODE_BUF))

		buf_flags |= XFS_BUF_MAPPED;



	bp = xfs_buf_read(mp->m_ddev_targp, blkno, len, buf_flags);

	if (XFS_BUF_ISERROR(bp)) {

		xfs_ioerror_alert("xlog_recover_do..(read#1)", log->l_mp,

				  bp, blkno);
@@ -2350,8 +2350,8 @@ xlog_recover_do_inode_trans( 
		goto error;

	}



	bp = xfs_buf_read_flags(mp->m_ddev_targp, in_f->ilf_blkno,

				in_f->ilf_len, XFS_BUF_LOCK);

	bp = xfs_buf_read(mp->m_ddev_targp, in_f->ilf_blkno, in_f->ilf_len,

			  XFS_BUF_LOCK);

	if (XFS_BUF_ISERROR(bp)) {

		xfs_ioerror_alert("xlog_recover_do..(read#2)", mp,

				  bp, in_f->ilf_blkno);