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

Commit 491f6f8a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: use the state defines in xfs_bmap_del_extent_real 



Use the same defines as the other extent add and delete helpers, which
both improves code readability and trace point output.

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 0173c689

fs/xfs/libxfs/xfs_bmap.c

+9 −12
Original line number Diff line number Diff line
@@ -5160,13 +5160,13 @@ xfs_bmap_del_extent_real( 
		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);

	}



	/*

	 * Set flag value to use in switch statement.

	 * Left-contig is 2, right-contig is 1.

	 */

	switch (((got.br_startoff == del->br_startoff) << 1) |

		(got_endoff == del_endoff)) {

	case 3:

	if (got.br_startoff == del->br_startoff)

		state |= BMAP_LEFT_FILLING;

	if (got_endoff == del_endoff)

		state |= BMAP_RIGHT_FILLING;



	switch (state & (BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING)) {

	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:

		/*

		 * Matches the whole extent.  Delete the entry.

		 */
@@ -5186,8 +5186,7 @@ xfs_bmap_del_extent_real( 
			goto done;

		XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);

		break;



	case 2:

	case BMAP_LEFT_FILLING:

		/*

		 * Deleting the first part of the extent.

		 */
@@ -5206,8 +5205,7 @@ xfs_bmap_del_extent_real( 
				got.br_state)))

			goto done;

		break;



	case 1:

	case BMAP_RIGHT_FILLING:

		/*

		 * Deleting the last part of the extent.

		 */
@@ -5225,7 +5223,6 @@ xfs_bmap_del_extent_real( 
				got.br_state)))

			goto done;

		break;



	case 0:

		/*

		 * Deleting the middle of the extent.