[PATCH 07/17] xfs: use the proper state defines in xfs_bmap_del_extent_real

Christoph Hellwig
2017-09-03T07:30:21Z

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_bmap.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index add690cb19a3..0a4bcef1cca8 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5162,13 +5162,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_CONTIG;
+ if (got_endoff == del_endoff)
+ state |= BMAP_RIGHT_CONTIG;
+
+ switch (state & (BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG)) {
+ case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
/*
* Matches the whole extent. Delete the entry.
*/
@@ -5188,8 +5188,7 @@ xfs_bmap_del_extent_real(
goto done;
XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
break;
-
- case 2:
+ case BMAP_LEFT_CONTIG:
/*
* Deleting the first part of the extent.
*/
@@ -5208,8 +5207,7 @@ xfs_bmap_del_extent_real(
got.br_state)))
goto done;
break;
-
- case 1:
+ case BMAP_RIGHT_CONTIG:
/*
* Deleting the last part of the extent.
*/
@@ -5227,7 +5225,6 @@ xfs_bmap_del_extent_real(
got.br_state)))
goto done;
break;
-
case 0:
/*
* Deleting the middle of the extent.
--
2.11.0