summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-11-03 10:34:41 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2017-11-06 11:53:39 -0800
commit657fcb23362c9e8a72593b3e4755135f003a7a74 (patch)
treeeb60645cc584face4cf4bb70cd42218ed97630d0 /fs/xfs
parenta681847796df31c036810bce97003f687e1db5f4 (diff)
xfs: treat idx as a cursor in xfs_bmap_del_extent_*
Stop poking before and after the index and just increment or decrement it while doing our operations on it to prepare for a new extent list implementation. 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>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/libxfs/xfs_bmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 3667fb1f3961..f64b6b74daa9 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4750,12 +4750,12 @@ xfs_bmap_del_extent_delay(
del->br_blockcount);
got->br_startblock = nullstartblock((int)got_indlen);
- xfs_iext_update_extent(ip, state, *idx, got);
new.br_startoff = del_endoff;
new.br_state = got->br_state;
new.br_startblock = nullstartblock((int)new_indlen);
+ xfs_iext_update_extent(ip, state, *idx, got);
++*idx;
xfs_iext_insert(ip, *idx, 1, &new, state);
@@ -4832,13 +4832,13 @@ xfs_bmap_del_extent_cow(
* Deleting the middle of the extent.
*/
got->br_blockcount = del->br_startoff - got->br_startoff;
- xfs_iext_update_extent(ip, state, *idx, got);
new.br_startoff = del_endoff;
new.br_blockcount = got_endoff - del_endoff;
new.br_state = got->br_state;
new.br_startblock = del->br_startblock + del->br_blockcount;
+ xfs_iext_update_extent(ip, state, *idx, got);
++*idx;
xfs_iext_insert(ip, *idx, 1, &new, state);
break;
@@ -5054,8 +5054,8 @@ xfs_bmap_del_extent_real(
flags |= xfs_ilog_fext(whichfork);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
- xfs_iext_insert(ip, *idx + 1, 1, &new, state);
++*idx;
+ xfs_iext_insert(ip, *idx, 1, &new, state);
break;
}