Commit 99be3f60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.6-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull moar xfs updates from Darrick Wong:
 "This contains the buffer error code refactoring I mentioned last week,
  now that it has had extra time to complete the full xfs fuzz testing
  suite to make sure there aren't any obvious new bugs"

* tag 'xfs-5.6-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix xfs_buf_ioerror_alert location reporting
  xfs: remove unnecessary null pointer checks from _read_agf callers
  xfs: make xfs_*read_agf return EAGAIN to ALLOC_FLAG_TRYLOCK callers
  xfs: remove the xfs_btree_get_buf[ls] functions
  xfs: make xfs_trans_get_buf return an error code
  xfs: make xfs_trans_get_buf_map return an error code
  xfs: make xfs_buf_read return an error code
  xfs: make xfs_buf_get_uncached return an error code
  xfs: make xfs_buf_get return an error code
  xfs: make xfs_buf_read_map return an error code
  xfs: make xfs_buf_get_map return an error code
  xfs: make xfs_buf_alloc return an error code
parents e310396b cdbcf82b

fs/xfs/libxfs/xfs_ag.c

+12 −9
Original line number Diff line number Diff line
@@ -23,25 +23,28 @@ 
#include "xfs_ag_resv.h"

#include "xfs_health.h"



static struct xfs_buf *

static int

xfs_get_aghdr_buf(

	struct xfs_mount	*mp,

	xfs_daddr_t		blkno,

	size_t			numblks,

	struct xfs_buf		**bpp,

	const struct xfs_buf_ops *ops)

{

	struct xfs_buf		*bp;

	int			error;



	bp = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, 0);

	if (!bp)

		return NULL;

	error = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, 0, &bp);

	if (error)

		return error;



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

	bp->b_bn = blkno;

	bp->b_maps[0].bm_bn = blkno;

	bp->b_ops = ops;



	return bp;

	*bpp = bp;

	return 0;

}



static inline bool is_log_ag(struct xfs_mount *mp, struct aghdr_init_data *id)
@@ -340,13 +343,13 @@ xfs_ag_init_hdr( 
	struct aghdr_init_data	*id,

	aghdr_init_work_f	work,

	const struct xfs_buf_ops *ops)



{

	struct xfs_buf		*bp;

	int			error;



	bp = xfs_get_aghdr_buf(mp, id->daddr, id->numblks, ops);

	if (!bp)

		return -ENOMEM;

	error = xfs_get_aghdr_buf(mp, id->daddr, id->numblks, &bp, ops);

	if (error)

		return error;



	(*work)(mp, bp, id);

fs/xfs/libxfs/xfs_alloc.c

+24 −27
Original line number Diff line number Diff line
@@ -1070,11 +1070,11 @@ xfs_alloc_ag_vextent_small( 
	if (args->datatype & XFS_ALLOC_USERDATA) {

		struct xfs_buf	*bp;



		bp = xfs_btree_get_bufs(args->mp, args->tp, args->agno, fbno);

		if (XFS_IS_CORRUPT(args->mp, !bp)) {

			error = -EFSCORRUPTED;

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

				XFS_AGB_TO_DADDR(args->mp, args->agno, fbno),

				args->mp->m_bsize, 0, &bp);

		if (error)

			goto error;

		}

		xfs_trans_binval(args->tp, bp);

	}

	*fbnop = args->agbno = fbno;
@@ -2347,9 +2347,11 @@ xfs_free_agfl_block( 
	if (error)

		return error;



	bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno);

	if (XFS_IS_CORRUPT(tp->t_mountp, !bp))

		return -EFSCORRUPTED;

	error = xfs_trans_get_buf(tp, tp->t_mountp->m_ddev_targp,

			XFS_AGB_TO_DADDR(tp->t_mountp, agno, agbno),

			tp->t_mountp->m_bsize, 0, &bp);

	if (error)

		return error;

	xfs_trans_binval(tp, bp);



	return 0;
@@ -2500,12 +2502,11 @@ xfs_alloc_fix_freelist( 


	if (!pag->pagf_init) {

		error = xfs_alloc_read_agf(mp, tp, args->agno, flags, &agbp);

		if (error)

		if (error) {

			/* Couldn't lock the AGF so skip this AG. */

			if (error == -EAGAIN)

				error = 0;

			goto out_no_agbp;

		if (!pag->pagf_init) {

			ASSERT(flags & XFS_ALLOC_FLAG_TRYLOCK);

			ASSERT(!(flags & XFS_ALLOC_FLAG_FREEING));

			goto out_agbp_relse;

		}

	}
@@ -2531,11 +2532,10 @@ xfs_alloc_fix_freelist( 
	 */

	if (!agbp) {

		error = xfs_alloc_read_agf(mp, tp, args->agno, flags, &agbp);

		if (error)

			goto out_no_agbp;

		if (!agbp) {

			ASSERT(flags & XFS_ALLOC_FLAG_TRYLOCK);

			ASSERT(!(flags & XFS_ALLOC_FLAG_FREEING));

		if (error) {

			/* Couldn't lock the AGF so skip this AG. */

			if (error == -EAGAIN)

				error = 0;

			goto out_no_agbp;

		}

	}
@@ -2766,11 +2766,10 @@ xfs_alloc_pagf_init( 
	xfs_buf_t		*bp;

	int			error;



	if ((error = xfs_alloc_read_agf(mp, tp, agno, flags, &bp)))

		return error;

	if (bp)

	error = xfs_alloc_read_agf(mp, tp, agno, flags, &bp);

	if (!error)

		xfs_trans_brelse(tp, bp);

	return 0;

	return error;

}



/*
@@ -2956,14 +2955,11 @@ xfs_read_agf( 
	trace_xfs_read_agf(mp, agno);



	ASSERT(agno != NULLAGNUMBER);

	error = xfs_trans_read_buf(

			mp, tp, mp->m_ddev_targp,

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,

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

			XFS_FSS_TO_BB(mp, 1), flags, bpp, &xfs_agf_buf_ops);

	if (error)

		return error;

	if (!*bpp)

		return 0;



	ASSERT(!(*bpp)->b_error);

	xfs_buf_set_ref(*bpp, XFS_AGF_REF);
@@ -2987,14 +2983,15 @@ xfs_alloc_read_agf( 


	trace_xfs_alloc_read_agf(mp, agno);



	/* We don't support trylock when freeing. */

	ASSERT((flags & (XFS_ALLOC_FLAG_FREEING | XFS_ALLOC_FLAG_TRYLOCK)) !=

			(XFS_ALLOC_FLAG_FREEING | XFS_ALLOC_FLAG_TRYLOCK));

	ASSERT(agno != NULLAGNUMBER);

	error = xfs_read_agf(mp, tp, agno,

			(flags & XFS_ALLOC_FLAG_TRYLOCK) ? XBF_TRYLOCK : 0,

			bpp);

	if (error)

		return error;

	if (!*bpp)

		return 0;

	ASSERT(!(*bpp)->b_error);



	agf = XFS_BUF_TO_AGF(*bpp);

fs/xfs/libxfs/xfs_attr_remote.c

+6 −16
Original line number Diff line number Diff line
@@ -418,20 +418,10 @@ xfs_attr_rmtval_get( 
			       (map[i].br_startblock != HOLESTARTBLOCK));

			dblkno = XFS_FSB_TO_DADDR(mp, map[i].br_startblock);

			dblkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount);

			bp = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt, 0,

					&xfs_attr3_rmt_buf_ops);

			if (!bp)

				return -ENOMEM;

			error = bp->b_error;

			if (error) {

				xfs_buf_ioerror_alert(bp, __func__);

				xfs_buf_relse(bp);



				/* bad CRC means corrupted metadata */

				if (error == -EFSBADCRC)

					error = -EFSCORRUPTED;

			error = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt,

					0, &bp, &xfs_attr3_rmt_buf_ops);

			if (error)

				return error;

			}



			error = xfs_attr_rmtval_copyout(mp, bp, args->dp->i_ino,

							&offset, &valuelen,
@@ -555,9 +545,9 @@ xfs_attr_rmtval_set( 
		dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock),

		dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount);



		bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt);

		if (!bp)

			return -ENOMEM;

		error = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt, &bp);

		if (error)

			return error;

		bp->b_ops = &xfs_attr3_rmt_buf_ops;



		xfs_attr_rmtval_copyin(mp, bp, args->dp->i_ino, &offset,

fs/xfs/libxfs/xfs_bmap.c

+15 −10
Original line number Diff line number Diff line
@@ -730,11 +730,11 @@ xfs_bmap_extents_to_btree( 
	cur->bc_private.b.allocated++;

	ip->i_d.di_nblocks++;

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L);

	abp = xfs_btree_get_bufl(mp, tp, args.fsbno);

	if (XFS_IS_CORRUPT(mp, !abp)) {

		error = -EFSCORRUPTED;

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp,

			XFS_FSB_TO_DADDR(mp, args.fsbno),

			mp->m_bsize, 0, &abp);

	if (error)

		goto out_unreserve_dquot;

	}



	/*

	 * Fill in the child block.
@@ -878,7 +878,11 @@ xfs_bmap_local_to_extents( 
	ASSERT(args.fsbno != NULLFSBLOCK);

	ASSERT(args.len == 1);

	tp->t_firstblock = args.fsbno;

	bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno);

	error = xfs_trans_get_buf(tp, args.mp->m_ddev_targp,

			XFS_FSB_TO_DADDR(args.mp, args.fsbno),

			args.mp->m_bsize, 0, &bp);

	if (error)

		goto done;



	/*

	 * Initialize the block, copy the data and log the remote buffer.
@@ -3307,11 +3311,12 @@ xfs_bmap_longest_free_extent( 
	pag = xfs_perag_get(mp, ag);

	if (!pag->pagf_init) {

		error = xfs_alloc_pagf_init(mp, tp, ag, XFS_ALLOC_FLAG_TRYLOCK);

		if (error)

			goto out;



		if (!pag->pagf_init) {

		if (error) {

			/* Couldn't lock the AGF, so skip this AG. */

			if (error == -EAGAIN) {

				*notinit = 1;

				error = 0;

			}

			goto out;

		}

	}

fs/xfs/libxfs/xfs_btree.c

+4 −41
Original line number Diff line number Diff line
@@ -678,42 +678,6 @@ xfs_btree_get_block( 
	return XFS_BUF_TO_BLOCK(*bpp);

}



/*

 * Get a buffer for the block, return it with no data read.

 * Long-form addressing.

 */

xfs_buf_t *				/* buffer for fsbno */

xfs_btree_get_bufl(

	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_fsblock_t	fsbno)		/* file system block number */

{

	xfs_daddr_t		d;		/* real disk block address */



	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);

}



/*

 * Get a buffer for the block, return it with no data read.

 * Short-form addressing.

 */

xfs_buf_t *				/* buffer for agno/agbno */

xfs_btree_get_bufs(

	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_agnumber_t	agno,		/* allocation group number */

	xfs_agblock_t	agbno)		/* allocation group block number */

{

	xfs_daddr_t		d;		/* real disk block address */



	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);

}



/*

 * Change the cursor to point to the first record at the given level.

 * Other levels are unaffected.
@@ -1270,11 +1234,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE