Commit 57bd3dbe authored by Brian Foster's avatar Brian Foster Committed by Dave Chinner
Browse files

xfs: refactor xfs_ialloc_btree.c to support multiple inobt numbers 



The introduction of the free inode btree (finobt) requires that
xfs_ialloc_btree.c handle multiple trees. Refactor xfs_ialloc_btree.c
so the caller specifies the btree type on cursor initialization to
prepare for addition of the finobt.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent c9eaa447

fs/xfs/xfs_ialloc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -461,7 +461,7 @@ xfs_ialloc_ag_alloc( 
	/*

	/*

	 * Insert records describing the new inode chunk into the btree.

	 * Insert records describing the new inode chunk into the btree.

	 */

	 */

	cur = xfs_inobt_init_cursor(args.mp, tp, agbp, agno);

	cur = xfs_inobt_init_cursor(args.mp, tp, agbp, agno, XFS_BTNUM_INO);

	for (thisino = newino;

	for (thisino = newino;

	     thisino < newino + newlen;

	     thisino < newino + newlen;

	     thisino += XFS_INODES_PER_CHUNK) {

	     thisino += XFS_INODES_PER_CHUNK) {
@@ -707,7 +707,7 @@ xfs_dialloc_ag( 
	ASSERT(pag->pagi_freecount > 0);

	ASSERT(pag->pagi_freecount > 0);





 restart_pagno:

 restart_pagno:

	cur = xfs_inobt_init_cursor(mp, tp, agbp, agno);

	cur = xfs_inobt_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_INO);

	/*

	/*

	 * If pagino is 0 (this is the root inode allocation) use newino.

	 * If pagino is 0 (this is the root inode allocation) use newino.

	 * This must work because we've just allocated some.

	 * This must work because we've just allocated some.
@@ -1169,7 +1169,7 @@ xfs_difree( 
	/*

	/*

	 * Initialize the cursor.

	 * Initialize the cursor.

	 */

	 */

	cur = xfs_inobt_init_cursor(mp, tp, agbp, agno);

	cur = xfs_inobt_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_INO);





	error = xfs_check_agi_freecount(cur, agi);

	error = xfs_check_agi_freecount(cur, agi);

	if (error)

	if (error)
@@ -1300,7 +1300,7 @@ xfs_imap_lookup( 
	 * we have a record, we need to ensure it contains the inode number

	 * we have a record, we need to ensure it contains the inode number

	 * we are looking up.

	 * we are looking up.

	 */

	 */

	cur = xfs_inobt_init_cursor(mp, tp, agbp, agno);

	cur = xfs_inobt_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_INO);

	error = xfs_inobt_lookup(cur, agino, XFS_LOOKUP_LE, &i);

	error = xfs_inobt_lookup(cur, agino, XFS_LOOKUP_LE, &i);

	if (!error) {

	if (!error) {

		if (i)

		if (i)

fs/xfs/xfs_ialloc_btree.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,8 @@ xfs_inobt_dup_cursor( 
	struct xfs_btree_cur	*cur)

	struct xfs_btree_cur	*cur)

{

{

	return xfs_inobt_init_cursor(cur->bc_mp, cur->bc_tp,

	return xfs_inobt_init_cursor(cur->bc_mp, cur->bc_tp,

			cur->bc_private.a.agbp, cur->bc_private.a.agno);

			cur->bc_private.a.agbp, cur->bc_private.a.agno,

			cur->bc_btnum);

}

}





STATIC void

STATIC void
@@ -325,7 +326,8 @@ xfs_inobt_init_cursor( 
	struct xfs_mount	*mp,		/* file system mount point */

	struct xfs_mount	*mp,		/* file system mount point */

	struct xfs_trans	*tp,		/* transaction pointer */

	struct xfs_trans	*tp,		/* transaction pointer */

	struct xfs_buf		*agbp,		/* buffer for agi structure */

	struct xfs_buf		*agbp,		/* buffer for agi structure */

	xfs_agnumber_t		agno)		/* allocation group number */

	xfs_agnumber_t		agno,		/* allocation group number */

	xfs_btnum_t		btnum)		/* ialloc or free ino btree */

{

{

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_agi		*agi = XFS_BUF_TO_AGI(agbp);

	struct xfs_btree_cur	*cur;

	struct xfs_btree_cur	*cur;
@@ -335,7 +337,7 @@ xfs_inobt_init_cursor( 
	cur->bc_tp = tp;

	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_mp = mp;

	cur->bc_nlevels = be32_to_cpu(agi->agi_level);

	cur->bc_nlevels = be32_to_cpu(agi->agi_level);

	cur->bc_btnum = XFS_BTNUM_INO;

	cur->bc_btnum = btnum;

	cur->bc_blocklog = mp->m_sb.sb_blocklog;

	cur->bc_blocklog = mp->m_sb.sb_blocklog;





	cur->bc_ops = &xfs_inobt_ops;

	cur->bc_ops = &xfs_inobt_ops;

fs/xfs/xfs_ialloc_btree.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,8 @@ struct xfs_mount; 
		 ((index) - 1) * sizeof(xfs_inobt_ptr_t)))

		 ((index) - 1) * sizeof(xfs_inobt_ptr_t)))





extern struct xfs_btree_cur *xfs_inobt_init_cursor(struct xfs_mount *,

extern struct xfs_btree_cur *xfs_inobt_init_cursor(struct xfs_mount *,

		struct xfs_trans *, struct xfs_buf *, xfs_agnumber_t);

		struct xfs_trans *, struct xfs_buf *, xfs_agnumber_t,

		xfs_btnum_t);

extern int xfs_inobt_maxrecs(struct xfs_mount *, int, int);

extern int xfs_inobt_maxrecs(struct xfs_mount *, int, int);





#endif	/* __XFS_IALLOC_BTREE_H__ */
 
#endif	/* __XFS_IALLOC_BTREE_H__ */

fs/xfs/xfs_itable.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -270,7 +270,8 @@ xfs_bulkstat( 
		/*

		/*

		 * Allocate and initialize a btree cursor for ialloc btree.

		 * Allocate and initialize a btree cursor for ialloc btree.

		 */

		 */

		cur = xfs_inobt_init_cursor(mp, NULL, agbp, agno);

		cur = xfs_inobt_init_cursor(mp, NULL, agbp, agno,

					    XFS_BTNUM_INO);

		irbp = irbuf;

		irbp = irbuf;

		irbufend = irbuf + nirbuf;

		irbufend = irbuf + nirbuf;

		end_of_ag = 0;

		end_of_ag = 0;
@@ -621,7 +622,8 @@ xfs_inumbers( 
				agino = 0;

				agino = 0;

				continue;

				continue;

			}

			}

			cur = xfs_inobt_init_cursor(mp, NULL, agbp, agno);

			cur = xfs_inobt_init_cursor(mp, NULL, agbp, agno,

						    XFS_BTNUM_INO);

			error = xfs_inobt_lookup(cur, agino, XFS_LOOKUP_GE,

			error = xfs_inobt_lookup(cur, agino, XFS_LOOKUP_GE,

						 &tmp);

						 &tmp);

			if (error) {

			if (error) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE