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

Commit e7455e02 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove the first extent special case in xfs_bmap_add_extent 



Both xfs_bmap_add_extent_hole_delay and xfs_bmap_add_extent_hole_real
already contain code to handle the case where there is no extent to
merge with, which is effectively the same as the code duplicated here.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent ed32201e

fs/xfs/xfs_bmap.c

+1 −18
Original line number Original line Diff line number Diff line
@@ -465,27 +465,10 @@ xfs_bmap_add_extent( 
	ASSERT(*idx >= 0);

	ASSERT(*idx >= 0);

	ASSERT(*idx <= nextents);

	ASSERT(*idx <= nextents);





	/*

	 * This is the first extent added to a new/empty file.

	 * Special case this one, so other routines get to assume there are

	 * already extents in the list.

	 */

	if (nextents == 0) {

		xfs_iext_insert(ip, *idx, 1, new,

				whichfork == XFS_ATTR_FORK ? BMAP_ATTRFORK : 0);



		ASSERT(cur == NULL);



		if (!isnullstartblock(new->br_startblock)) {

			XFS_IFORK_NEXT_SET(ip, whichfork, 1);

			logflags = XFS_ILOG_CORE | xfs_ilog_fext(whichfork);

		} else

			logflags = 0;

	}

	/*

	/*

	 * Any kind of new delayed allocation goes here.

	 * Any kind of new delayed allocation goes here.

	 */

	 */

	else if (isnullstartblock(new->br_startblock)) {

	if (isnullstartblock(new->br_startblock)) {

		if (cur)

		if (cur)

			ASSERT((cur->bc_private.b.flags &

			ASSERT((cur->bc_private.b.flags &

				XFS_BTCUR_BPRV_WASDEL) == 0);

				XFS_BTCUR_BPRV_WASDEL) == 0);