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

Commit 3ffc18ec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: refactor xfs_bmap_add_extent_hole_delay 



Use xfs_iext_get_extent to find, and xfs_iext_update_extent to update
entries in the in-core extent list.  This isolates the function from
the detailed layout of the extent list, and generally makes the code
a lot more readable.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 48fd52b1

fs/xfs/libxfs/xfs_bmap.c

+11 −10
Original line number Diff line number Diff line
@@ -2688,7 +2688,7 @@ xfs_bmap_add_extent_hole_delay( 
	xfs_filblks_t		oldlen=0;	/* old indirect size */

	xfs_bmbt_irec_t		right;	/* right neighbor extent entry */

	int			state;  /* state bits, accessed thru macros */

	xfs_filblks_t		temp=0;	/* temp for indirect calculations */

	xfs_filblks_t		temp;	 /* temp for indirect calculations */



	ifp = XFS_IFORK_PTR(ip, whichfork);

	state = 0;
@@ -2751,14 +2751,14 @@ xfs_bmap_add_extent_hole_delay( 
			right.br_blockcount;



		trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);

		xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, *idx), temp);

		oldlen = startblockval(left.br_startblock) +

			startblockval(new->br_startblock) +

			startblockval(right.br_startblock);

		newlen = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),

					 oldlen);

		xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, *idx),

			nullstartblock((int)newlen));

		left.br_startblock = nullstartblock(newlen);

		left.br_blockcount = temp;

		xfs_iext_update_extent(ifp, *idx, &left);

		trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);



		xfs_iext_remove(ip, *idx + 1, 1, state);
@@ -2774,13 +2774,13 @@ xfs_bmap_add_extent_hole_delay( 
		temp = left.br_blockcount + new->br_blockcount;



		trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);

		xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, *idx), temp);

		oldlen = startblockval(left.br_startblock) +

			startblockval(new->br_startblock);

		newlen = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),

					 oldlen);

		xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, *idx),

			nullstartblock((int)newlen));

		left.br_blockcount = temp;

		left.br_startblock = nullstartblock(newlen);

		xfs_iext_update_extent(ifp, *idx, &left);

		trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);

		break;
@@ -2796,9 +2796,10 @@ xfs_bmap_add_extent_hole_delay( 
			startblockval(right.br_startblock);

		newlen = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),

					 oldlen);

		xfs_bmbt_set_allf(xfs_iext_get_ext(ifp, *idx),

			new->br_startoff,

			nullstartblock((int)newlen), temp, right.br_state);

		right.br_startoff = new->br_startoff;

		right.br_startblock = nullstartblock(newlen);

		right.br_blockcount = temp;

		xfs_iext_update_extent(ifp, *idx, &right);

		trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);

		break;