summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-11-03 20:34:40 +0300
committerDarrick J. Wong <darrick.wong@oracle.com>2017-11-06 22:53:39 +0300
commit1d2e0089e16642928c76f032c1dbd0eb6da22935 (patch)
tree28b856b34df7770ee31fe2c736a55d6d4e0e376d /fs/xfs
parent41d196f439509fd8b09364ca1ba48194cccc6d6e (diff)
downloadlinux-1d2e0089e16642928c76f032c1dbd0eb6da22935.tar.xz
xfs: treat idx as a cursor in xfs_bmap_add_extent_hole_real
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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index e2d8cbd054fe..117083b1d1ae 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -2742,11 +2742,11 @@ xfs_bmap_add_extent_hole_real(
* left and on the right.
* Merge all three into a single extent record.
*/
- --*idx;
left.br_blockcount += new->br_blockcount + right.br_blockcount;
- xfs_iext_update_extent(ip, state, *idx, &left);
- xfs_iext_remove(ip, *idx + 1, 1, state);
+ xfs_iext_remove(ip, *idx, 1, state);
+ --*idx;
+ xfs_iext_update_extent(ip, state, *idx, &left);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
@@ -2778,10 +2778,10 @@ xfs_bmap_add_extent_hole_real(
* on the left.
* Merge the new allocation with the left neighbor.
*/
- --*idx;
old = left;
-
left.br_blockcount += new->br_blockcount;
+
+ --*idx;
xfs_iext_update_extent(ip, state, *idx, &left);
if (cur == NULL) {