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

Commit 4bb61069 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

xfs: add a short cut to xfs_dialloc for the non-NULL agbp case 



In this case we already have selected an AG and know it has free space
beause the buffer lock never got released.  Jump directly into xfs_dialloc_ag
and short cut the AG selection loop.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 08358906

fs/xfs/xfs_ialloc.c

+26 −21
Original line number Diff line number Diff line
@@ -634,6 +634,10 @@ xfs_dialloc_ag( 


	pag = xfs_perag_get(mp, agno);



	ASSERT(pag->pagi_init);

	ASSERT(pag->pagi_inodeok);

	ASSERT(pag->pagi_freecount > 0);



 restart_pagno:

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

	/*
@@ -907,12 +911,22 @@ xfs_dialloc( 
	xfs_agnumber_t		tagno;

	struct xfs_perag	*pag;



	if (*IO_agbp == NULL) {

	if (*IO_agbp) {

		/*

		 * If the caller passes in a pointer to the AGI buffer,

		 * continue where we left off before.  In this case, we

		 * know that the allocation group has free inodes.

		 */

		agbp = *IO_agbp;

		goto out_alloc;

	}



	/*

	 * We do not have an agbp, so select an initial allocation

	 * group for inode allocation.

	 */

	agbp = xfs_ialloc_ag_select(tp, parent, mode, okalloc);



	/*

	 * Couldn't find an allocation group satisfying the

	 * criteria, give up.
@@ -922,17 +936,7 @@ xfs_dialloc( 
		return 0;

	}

	agi = XFS_BUF_TO_AGI(agbp);

		ASSERT(agi->agi_magicnum == cpu_to_be32(XFS_AGI_MAGIC));

	} else {

		/*

		 * Continue where we left off before.  In this case, we

		 * know that the allocation group has free inodes.

		 */

		agbp = *IO_agbp;

		agi = XFS_BUF_TO_AGI(agbp);

		ASSERT(agi->agi_magicnum == cpu_to_be32(XFS_AGI_MAGIC));

		ASSERT(be32_to_cpu(agi->agi_freecount) > 0);

	}



	mp = tp->t_mountp;

	agno = be32_to_cpu(agi->agi_seqno);

	tagno = agno;
@@ -1012,6 +1016,7 @@ nextag: 
		ASSERT(agi->agi_magicnum == cpu_to_be32(XFS_AGI_MAGIC));

	}



out_alloc:

	*IO_agbp = NULL;

	return xfs_dialloc_ag(tp, agbp, parent, inop);

}