redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

xfs: use the state defines in xfs_bmap_del_extent_real

Browse source 
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>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2017-10-17 14:16:23 -07:00 committed by Darrick J. Wong
parent 0173c689ff
commit 491f6f8abf
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/xfs/libxfs/xfs_bmap.c
View file

@ -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.