xfs: remove bmap block allocation retries (7590632a) · Commits · 戴 / test

fs/xfs/libxfs/xfs_bmap.c

+0 −29

Original line number	Diff line number	Diff line
		@@ -764,7 +764,6 @@ xfs_bmap_extents_to_btree(
		args.fsbno = XFS_INO_TO_FSB(mp, ip->i_ino);
		} else if (dfops->dop_low) {
		args.type = XFS_ALLOCTYPE_START_BNO;
		try_another_ag:
		args.fsbno = *firstblock;
		} else {
		args.type = XFS_ALLOCTYPE_NEAR_BNO;
		@@ -779,20 +778,6 @@ try_another_ag:
		return error;
		}

		/*
		* During a CoW operation, the allocation and bmbt updates occur in
		* different transactions. The mapping code tries to put new bmbt
		* blocks near extents being mapped, but the only way to guarantee this
		* is if the alloc and the mapping happen in a single transaction that
		* has a block reservation. That isn't the case here, so if we run out
		* of space we'll try again with another AG.
		*/
		if (xfs_sb_version_hasreflink(&cur->bc_mp->m_sb) &&
		args.fsbno == NULLFSBLOCK &&
		args.type == XFS_ALLOCTYPE_NEAR_BNO) {
		args.type = XFS_ALLOCTYPE_FIRST_AG;
		goto try_another_ag;
		}
		if (WARN_ON_ONCE(args.fsbno == NULLFSBLOCK)) {
		xfs_iroot_realloc(ip, -1, whichfork);
		xfs_btree_del_cursor(cur, XFS_BTREE_ERROR);
		@@ -925,7 +910,6 @@ xfs_bmap_local_to_extents(
		* file currently fits in an inode.
		*/
		if (*firstblock == NULLFSBLOCK) {
		try_another_ag:
		args.fsbno = XFS_INO_TO_FSB(args.mp, ip->i_ino);
		args.type = XFS_ALLOCTYPE_START_BNO;
		} else {
		@@ -938,19 +922,6 @@ try_another_ag:
		if (error)
		goto done;

		/*
		* During a CoW operation, the allocation and bmbt updates occur in
		* different transactions. The mapping code tries to put new bmbt
		* blocks near extents being mapped, but the only way to guarantee this
		* is if the alloc and the mapping happen in a single transaction that
		* has a block reservation. That isn't the case here, so if we run out
		* of space we'll try again with another AG.
		*/
		if (xfs_sb_version_hasreflink(&ip->i_mount->m_sb) &&
		args.fsbno == NULLFSBLOCK &&
		args.type == XFS_ALLOCTYPE_NEAR_BNO) {
		goto try_another_ag;
		}
		/* Can't fail, the space was reserved. */
		ASSERT(args.fsbno != NULLFSBLOCK);
		ASSERT(args.len == 1);

fs/xfs/libxfs/xfs_bmap_btree.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -448,7 +448,6 @@ xfs_bmbt_alloc_block(
		if (args.fsbno == NULLFSBLOCK) {
		args.fsbno = be64_to_cpu(start->l);
		args.type = XFS_ALLOCTYPE_START_BNO;
		try_another_ag:
		/*
		* Make sure there is sufficient room left in the AG to
		* complete a full tree split for an extent insert. If
		@@ -477,22 +476,6 @@ try_another_ag:
		if (error)
		goto error0;

		/*
		* During a CoW operation, the allocation and bmbt updates occur in
		* different transactions. The mapping code tries to put new bmbt
		* blocks near extents being mapped, but the only way to guarantee this
		* is if the alloc and the mapping happen in a single transaction that
		* has a block reservation. That isn't the case here, so if we run out
		* of space we'll try again with another AG.
		*/
		if (xfs_sb_version_hasreflink(&cur->bc_mp->m_sb) &&
		args.fsbno == NULLFSBLOCK &&
		args.type == XFS_ALLOCTYPE_NEAR_BNO) {
		args.fsbno = cur->bc_private.b.firstblock;
		args.type = XFS_ALLOCTYPE_FIRST_AG;
		goto try_another_ag;
		}

		if (args.fsbno == NULLFSBLOCK && args.minleft) {
		/*
		* Could not find an AG with enough free space to satisfy

Admin message