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

xfs: specify AG in bulk req 



Add a new xfs_bulk_ireq flag to constrain the iteration to a single AG.
If the passed-in startino value is zero then we start with the first
inode in the AG that the user passes in; otherwise, we iterate only
within the same AG as the passed-in inode.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent fba9760a

fs/xfs/libxfs/xfs_fs.h

+8 −2
Original line number Diff line number Diff line
@@ -462,11 +462,17 @@ struct xfs_bulk_ireq { 
	uint32_t	flags;		/* I/O: operation flags		*/

	uint32_t	icount;		/* I: count of entries in buffer */

	uint32_t	ocount;		/* O: count of entries filled out */

	uint32_t	reserved32;	/* must be zero			*/

	uint32_t	agno;		/* I: see comment for IREQ_AGNO	*/

	uint64_t	reserved[5];	/* must be zero			*/

};



#define XFS_BULK_IREQ_FLAGS_ALL	(0)

/*

 * Only return results from the specified @agno.  If @ino is zero, start

 * with the first inode of @agno.

 */

#define XFS_BULK_IREQ_AGNO	(1 << 0)



#define XFS_BULK_IREQ_FLAGS_ALL	(XFS_BULK_IREQ_AGNO)



/*

 * ioctl structures for v5 bulkstat and inumbers requests

fs/xfs/xfs_ioctl.c

+23 −1
Original line number Diff line number Diff line
@@ -844,7 +844,6 @@ xfs_bulk_ireq_setup( 
{

	if (hdr->icount == 0 ||

	    (hdr->flags & ~XFS_BULK_IREQ_FLAGS_ALL) ||

	    hdr->reserved32 ||

	    memchr_inv(hdr->reserved, 0, sizeof(hdr->reserved)))

		return -EINVAL;
@@ -852,6 +851,29 @@ xfs_bulk_ireq_setup( 
	breq->ubuffer = ubuffer;

	breq->icount = hdr->icount;

	breq->ocount = 0;

	breq->flags = 0;



	/*

	 * The IREQ_AGNO flag means that we only want results from a given AG.

	 * If @hdr->ino is zero, we start iterating in that AG.  If @hdr->ino is

	 * beyond the specified AG then we return no results.

	 */

	if (hdr->flags & XFS_BULK_IREQ_AGNO) {

		if (hdr->agno >= mp->m_sb.sb_agcount)

			return -EINVAL;



		if (breq->startino == 0)

			breq->startino = XFS_AGINO_TO_INO(mp, hdr->agno, 0);

		else if (XFS_INO_TO_AGNO(mp, breq->startino) < hdr->agno)

			return -EINVAL;



		breq->flags |= XFS_IBULK_SAME_AG;



		/* Asking for an inode past the end of the AG?  We're done! */

		if (XFS_INO_TO_AGNO(mp, breq->startino) > hdr->agno)

			return XFS_ITER_ABORT;

	} else if (hdr->agno)

		return -EINVAL;



	/* Asking for an inode past the end of the FS?  We're done! */

	if (XFS_INO_TO_AGNO(mp, breq->startino) >= mp->m_sb.sb_agcount)

fs/xfs/xfs_itable.c

+3 −3
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ xfs_bulkstat( 
	if (!bc.buf)

		return -ENOMEM;



	error = xfs_iwalk(breq->mp, NULL, breq->startino, xfs_bulkstat_iwalk,

			breq->icount, &bc);

	error = xfs_iwalk(breq->mp, NULL, breq->startino, breq->flags,

			xfs_bulkstat_iwalk, breq->icount, &bc);



	kmem_free(bc.buf);
@@ -367,7 +367,7 @@ xfs_inumbers( 
	if (xfs_bulkstat_already_done(breq->mp, breq->startino))

		return 0;



	error = xfs_inobt_walk(breq->mp, NULL, breq->startino,

	error = xfs_inobt_walk(breq->mp, NULL, breq->startino, breq->flags,

			xfs_inumbers_walk, breq->icount, &ic);



	/*

fs/xfs/xfs_itable.h

+4 −0
Original line number Diff line number Diff line
@@ -12,8 +12,12 @@ struct xfs_ibulk { 
	xfs_ino_t		startino; /* start with this inode */

	unsigned int		icount;   /* number of elements in ubuffer */

	unsigned int		ocount;   /* number of records returned */

	unsigned int		flags;    /* see XFS_IBULK_FLAG_* */

};



/* Only iterate within the same AG as startino */

#define XFS_IBULK_SAME_AG	(XFS_IWALK_SAME_AG)



/* Return value that means we want to abort the walk. */

#define XFS_IBULK_ABORT		(XFS_IWALK_ABORT)

fs/xfs/xfs_iwalk.c

+12 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ xfs_iwalk( 
	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	xfs_ino_t		startino,

	unsigned int		flags,

	xfs_iwalk_fn		iwalk_fn,

	unsigned int		inode_records,

	void			*data)
@@ -538,6 +539,7 @@ xfs_iwalk( 
	int			error;



	ASSERT(agno < mp->m_sb.sb_agcount);

	ASSERT(!(flags & ~XFS_IWALK_FLAGS_ALL));



	error = xfs_iwalk_alloc(&iwag);

	if (error)
@@ -548,6 +550,8 @@ xfs_iwalk( 
		if (error)

			break;

		iwag.startino = XFS_AGINO_TO_INO(mp, agno + 1, 0);

		if (flags & XFS_INOBT_WALK_SAME_AG)

			break;

	}



	xfs_iwalk_free(&iwag);
@@ -586,6 +590,7 @@ int 
xfs_iwalk_threaded(

	struct xfs_mount	*mp,

	xfs_ino_t		startino,

	unsigned int		flags,

	xfs_iwalk_fn		iwalk_fn,

	unsigned int		inode_records,

	bool			polled,
@@ -597,6 +602,7 @@ xfs_iwalk_threaded( 
	int			error;



	ASSERT(agno < mp->m_sb.sb_agcount);

	ASSERT(!(flags & ~XFS_IWALK_FLAGS_ALL));



	nr_threads = xfs_pwork_guess_datadev_parallelism(mp);

	error = xfs_pwork_init(mp, &pctl, xfs_iwalk_ag_work, "xfs_iwalk",
@@ -618,6 +624,8 @@ xfs_iwalk_threaded( 
		iwag->sz_recs = xfs_iwalk_prefetch(inode_records);

		xfs_pwork_queue(&pctl, &iwag->pwork);

		startino = XFS_AGINO_TO_INO(mp, agno + 1, 0);

		if (flags & XFS_INOBT_WALK_SAME_AG)

			break;

	}



	if (polled)
@@ -674,6 +682,7 @@ xfs_inobt_walk( 
	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	xfs_ino_t		startino,

	unsigned int		flags,

	xfs_inobt_walk_fn	inobt_walk_fn,

	unsigned int		inobt_records,

	void			*data)
@@ -691,6 +700,7 @@ xfs_inobt_walk( 
	int			error;



	ASSERT(agno < mp->m_sb.sb_agcount);

	ASSERT(!(flags & ~XFS_INOBT_WALK_FLAGS_ALL));



	error = xfs_iwalk_alloc(&iwag);

	if (error)
@@ -701,6 +711,8 @@ xfs_inobt_walk( 
		if (error)

			break;

		iwag.startino = XFS_AGINO_TO_INO(mp, agno + 1, 0);

		if (flags & XFS_INOBT_WALK_SAME_AG)

			break;

	}



	xfs_iwalk_free(&iwag);

CRA Git | Maintained and supported by SUSTech CRA and CCSE