Commit ce92464c authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: make xfs_trans_get_buf return an error code 



Convert xfs_trans_get_buf() to return numeric error codes like most
everywhere else in xfs.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 9676b54e

fs/xfs/libxfs/xfs_btree.c

+16 −7
Original line number Diff line number Diff line
@@ -688,11 +688,16 @@ xfs_btree_get_bufl( 
	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_fsblock_t	fsbno)		/* file system block number */

{

	struct xfs_buf		*bp;

	xfs_daddr_t		d;		/* real disk block address */

	int			error;



	ASSERT(fsbno != NULLFSBLOCK);

	d = XFS_FSB_TO_DADDR(mp, fsbno);

	return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0, &bp);

	if (error)

		return NULL;

	return bp;

}



/*
@@ -706,12 +711,17 @@ xfs_btree_get_bufs( 
	xfs_agnumber_t	agno,		/* allocation group number */

	xfs_agblock_t	agbno)		/* allocation group block number */

{

	struct xfs_buf		*bp;

	xfs_daddr_t		d;		/* real disk block address */

	int			error;



	ASSERT(agno != NULLAGNUMBER);

	ASSERT(agbno != NULLAGBLOCK);

	d = XFS_AGB_TO_DADDR(mp, agno, agbno);

	return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0, &bp);

	if (error)

		return NULL;

	return bp;

}



/*
@@ -1270,11 +1280,10 @@ xfs_btree_get_buf_block( 
	error = xfs_btree_ptr_to_daddr(cur, ptr, &d);

	if (error)

		return error;

	*bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d,

				 mp->m_bsize, 0);



	if (!*bpp)

		return -ENOMEM;

	error = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d, mp->m_bsize,

			0, bpp);

	if (error)

		return error;



	(*bpp)->b_ops = cur->bc_ops->buf_ops;

	*block = XFS_BUF_TO_BLOCK(*bpp);

fs/xfs/libxfs/xfs_ialloc.c

+6 −6
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ xfs_ialloc_inode_init( 
	int			i, j;

	xfs_daddr_t		d;

	xfs_ino_t		ino = 0;

	int			error;



	/*

	 * Loop over the new block(s), filling in the inodes.  For small block
@@ -327,12 +328,11 @@ xfs_ialloc_inode_init( 
		 */

		d = XFS_AGB_TO_DADDR(mp, agno, agbno +

				(j * M_IGEO(mp)->blocks_per_cluster));

		fbuf = xfs_trans_get_buf(tp, mp->m_ddev_targp, d,

					 mp->m_bsize *

					 M_IGEO(mp)->blocks_per_cluster,

					 XBF_UNMAPPED);

		if (!fbuf)

			return -ENOMEM;

		error = xfs_trans_get_buf(tp, mp->m_ddev_targp, d,

				mp->m_bsize * M_IGEO(mp)->blocks_per_cluster,

				XBF_UNMAPPED, &fbuf);

		if (error)

			return error;



		/* Initialize the inode buffers and log them appropriately. */

		fbuf->b_ops = &xfs_inode_buf_ops;

fs/xfs/libxfs/xfs_sb.c

+5 −4
Original line number Diff line number Diff line
@@ -1185,13 +1185,14 @@ xfs_sb_get_secondary( 
	struct xfs_buf		**bpp)

{

	struct xfs_buf		*bp;

	int			error;



	ASSERT(agno != 0 && agno != NULLAGNUMBER);

	bp = xfs_trans_get_buf(tp, mp->m_ddev_targp,

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp,

			XFS_AG_DADDR(mp, agno, XFS_SB_BLOCK(mp)),

			XFS_FSS_TO_BB(mp, 1), 0);

	if (!bp)

		return -ENOMEM;

			XFS_FSS_TO_BB(mp, 1), 0, &bp);

	if (error)

		return error;

	bp->b_ops = &xfs_sb_buf_ops;

	xfs_buf_oneshot(bp);

	*bpp = bp;

fs/xfs/scrub/repair.c

+6 −2
Original line number Diff line number Diff line
@@ -341,13 +341,17 @@ xrep_init_btblock( 
	struct xfs_trans		*tp = sc->tp;

	struct xfs_mount		*mp = sc->mp;

	struct xfs_buf			*bp;

	int				error;



	trace_xrep_init_btblock(mp, XFS_FSB_TO_AGNO(mp, fsb),

			XFS_FSB_TO_AGBNO(mp, fsb), btnum);



	ASSERT(XFS_FSB_TO_AGNO(mp, fsb) == sc->sa.agno);

	bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, XFS_FSB_TO_DADDR(mp, fsb),

			XFS_FSB_TO_BB(mp, 1), 0);

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp,

			XFS_FSB_TO_DADDR(mp, fsb), XFS_FSB_TO_BB(mp, 1), 0,

			&bp);

	if (error)

		return error;

	xfs_buf_zero(bp, 0, BBTOB(bp->b_length));

	xfs_btree_init_block(mp, bp, btnum, 0, 0, sc->sa.agno);

	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_BTREE_BUF);

fs/xfs/xfs_attr_inactive.c

+9 −8
Original line number Diff line number Diff line
@@ -205,11 +205,12 @@ xfs_attr3_node_inactive( 
		/*

		 * Remove the subsidiary block from the cache and from the log.

		 */

		child_bp = xfs_trans_get_buf(*trans, mp->m_ddev_targp,

		error = xfs_trans_get_buf(*trans, mp->m_ddev_targp,

				child_blkno,

				XFS_FSB_TO_BB(mp, mp->m_attr_geo->fsbcount), 0);

		if (!child_bp)

			return -EIO;

				XFS_FSB_TO_BB(mp, mp->m_attr_geo->fsbcount), 0,

				&child_bp);

		if (error)

			return error;

		error = bp->b_error;

		if (error) {

			xfs_trans_brelse(*trans, child_bp);
@@ -298,10 +299,10 @@ xfs_attr3_root_inactive( 
	/*

	 * Invalidate the incore copy of the root block.

	 */

	bp = xfs_trans_get_buf(*trans, mp->m_ddev_targp, blkno,

			XFS_FSB_TO_BB(mp, mp->m_attr_geo->fsbcount), 0);

	if (!bp)

		return -EIO;

	error = xfs_trans_get_buf(*trans, mp->m_ddev_targp, blkno,

			XFS_FSB_TO_BB(mp, mp->m_attr_geo->fsbcount), 0, &bp);

	if (error)

		return error;

	error = bp->b_error;

	if (error) {

		xfs_trans_brelse(*trans, bp);