From 7dae419ab516f690c398ae28fae7a5b02a5904ed Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 3 Nov 2017 10:34:41 -0700
Subject: [PATCH 53/77] xfs: treat idx as a cursor in xfs_bmap_del_extent_*
Git-commit: 657fcb23362c9e8a72593b3e4755135f003a7a74
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 2992e2ffcfbb..c9ff672c9225 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4766,12 +4766,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);
@@ -4848,13 +4848,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;
@@ -5070,8 +5070,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;
}
--
2.7.4