xfs: kill ialloced in xfs_dialloc() (3937493c) · Commits · 戴 / test

fs/xfs/libxfs/xfs_ialloc.c

+9 −13

Original line number	Diff line number	Diff line
		@@ -607,13 +607,13 @@ error:

		/*
		* Allocate new inodes in the allocation group specified by agbp.
		* Return 0 for success, else error code.
		* Returns 0 if inodes were allocated in this AG; 1 if there was no space
		* in this AG; or the usual negative error code.
		*/
		STATIC int
		xfs_ialloc_ag_alloc(
		struct xfs_trans *tp,
		struct xfs_buf *agbp,
		int *alloc)
		struct xfs_buf *agbp)
		{
		struct xfs_agi *agi;
		struct xfs_alloc_arg args;
		@@ -795,10 +795,9 @@ sparse_alloc:
		allocmask = (1 << (newlen / XFS_INODES_PER_HOLEMASK_BIT)) - 1;
		}

		if (args.fsbno == NULLFSBLOCK) {
		*alloc = 0;
		return 0;
		}
		if (args.fsbno == NULLFSBLOCK)
		return 1;

		ASSERT(args.len == args.minlen);

		/*
		@@ -903,7 +902,6 @@ sparse_alloc:
		*/
		xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, (long)newlen);
		xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, (long)newlen);
		*alloc = 1;
		return 0;
		}

		@@ -1739,7 +1737,6 @@ xfs_dialloc_select_ag(
		struct xfs_buf *agbp;
		xfs_agnumber_t agno;
		int error;
		int ialloced;
		bool noroom = false;
		xfs_agnumber_t start_agno;
		struct xfs_perag *pag;
		@@ -1812,9 +1809,8 @@ xfs_dialloc_select_ag(
		if (!okalloc)
		goto nextag_relse_buffer;


		error = xfs_ialloc_ag_alloc(*tpp, agbp, &ialloced);
		if (error) {
		error = xfs_ialloc_ag_alloc(*tpp, agbp);
		if (error < 0) {
		xfs_trans_brelse(*tpp, agbp);

		if (error == -ENOSPC)
		@@ -1822,7 +1818,7 @@ xfs_dialloc_select_ag(
		break;
		}

		if (ialloced) {
		if (error == 0) {
		/*
		* We successfully allocated space for an inode cluster
		* in this AG. Roll the transaction so that we can