From f48cf0ebe8dcb42b2780cb997e205c37ed8ae496 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 3 Nov 2017 10:34:39 -0700
Subject: [PATCH 50/77] xfs: treat idx as a cursor in
xfs_bmap_add_extent_hole_delay
Git-commit: 41d196f439509fd8b09364ca1ba48194cccc6d6e
Patch-mainline: v4.15-rc1
References: bsc#1095344
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>
Acked-by: Nikolay Borisov <nborisov@suse.com>
---
fs/xfs/libxfs/xfs_bmap.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index eaef60488c32..c424fe85c12b 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -2600,7 +2600,6 @@ xfs_bmap_add_extent_hole_delay(
* on the left and on the right.
* Merge all three into a single extent record.
*/
- --*idx;
temp = left.br_blockcount + new->br_blockcount +
right.br_blockcount;
@@ -2611,9 +2610,10 @@ xfs_bmap_add_extent_hole_delay(
oldlen);
left.br_startblock = nullstartblock(newlen);
left.br_blockcount = temp;
- 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);
break;
case BMAP_LEFT_CONTIG:
@@ -2622,7 +2622,6 @@ xfs_bmap_add_extent_hole_delay(
* on the left.
* Merge the new allocation with the left neighbor.
*/
- --*idx;
temp = left.br_blockcount + new->br_blockcount;
oldlen = startblockval(left.br_startblock) +
@@ -2631,6 +2630,8 @@ xfs_bmap_add_extent_hole_delay(
oldlen);
left.br_blockcount = temp;
left.br_startblock = nullstartblock(newlen);
+
+ --*idx;
xfs_iext_update_extent(ip, state, *idx, &left);
break;
--
2.7.4