From 5d20456d4f84c0f16f0da931c35e621ed8bb1489 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 3 Nov 2017 10:34:40 -0700
Subject: [PATCH 52/77] xfs: treat idx as a cursor in
xfs_bmap_add_extent_unwritten_real
Git-commit: a681847796df31c036810bce97003f687e1db5f4
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 | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 4232f0e475f4..2992e2ffcfbb 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -2168,12 +2168,11 @@ xfs_bmap_add_extent_unwritten_real(
* Setting all of a previous oldext extent to newext.
* The left and right neighbors are both contiguous with new.
*/
- --*idx;
-
LEFT.br_blockcount += PREV.br_blockcount + RIGHT.br_blockcount;
- xfs_iext_update_extent(ip, state, *idx, &LEFT);
- xfs_iext_remove(ip, *idx + 1, 2, state);
+ xfs_iext_remove(ip, *idx, 2, state);
+ --*idx;
+ xfs_iext_update_extent(ip, state, *idx, &LEFT);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) - 2);
if (cur == NULL)
@@ -2207,12 +2206,11 @@ xfs_bmap_add_extent_unwritten_real(
* Setting all of a previous oldext extent to newext.
* The left neighbor is contiguous, the right is not.
*/
- --*idx;
-
LEFT.br_blockcount += PREV.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);
if (cur == NULL)
@@ -2242,9 +2240,12 @@ xfs_bmap_add_extent_unwritten_real(
*/
PREV.br_blockcount += RIGHT.br_blockcount;
PREV.br_state = new->br_state;
+
+ ++*idx;
+ xfs_iext_remove(ip, *idx, 1, state);
+ --*idx;
xfs_iext_update_extent(ip, state, *idx, &PREV);
- xfs_iext_remove(ip, *idx + 1, 1, state);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
if (cur == NULL)
@@ -2296,15 +2297,15 @@ xfs_bmap_add_extent_unwritten_real(
* The left neighbor is contiguous.
*/
LEFT.br_blockcount += new->br_blockcount;
- xfs_iext_update_extent(ip, state, *idx - 1, &LEFT);
old = PREV;
PREV.br_startoff += new->br_blockcount;
PREV.br_startblock += new->br_blockcount;
PREV.br_blockcount -= new->br_blockcount;
- xfs_iext_update_extent(ip, state, *idx, &PREV);
+ xfs_iext_update_extent(ip, state, *idx, &PREV);
--*idx;
+ xfs_iext_update_extent(ip, state, *idx, &LEFT);
if (cur == NULL)
rval = XFS_ILOG_DEXT;
@@ -2335,8 +2336,8 @@ xfs_bmap_add_extent_unwritten_real(
PREV.br_startoff += new->br_blockcount;
PREV.br_startblock += new->br_blockcount;
PREV.br_blockcount -= new->br_blockcount;
- xfs_iext_update_extent(ip, state, *idx, &PREV);
+ xfs_iext_update_extent(ip, state, *idx, &PREV);
xfs_iext_insert(ip, *idx, 1, new, state);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
@@ -2365,13 +2366,13 @@ xfs_bmap_add_extent_unwritten_real(
*/
old = PREV;
PREV.br_blockcount -= new->br_blockcount;
- xfs_iext_update_extent(ip, state, *idx, &PREV);
-
- ++*idx;
RIGHT.br_startoff = new->br_startoff;
RIGHT.br_startblock = new->br_startblock;
RIGHT.br_blockcount += new->br_blockcount;
+
+ xfs_iext_update_extent(ip, state, *idx, &PREV);
+ ++*idx;
xfs_iext_update_extent(ip, state, *idx, &RIGHT);
if (cur == NULL)
@@ -2401,8 +2402,8 @@ xfs_bmap_add_extent_unwritten_real(
*/
old = PREV;
PREV.br_blockcount -= new->br_blockcount;
- xfs_iext_update_extent(ip, state, *idx, &PREV);
+ xfs_iext_update_extent(ip, state, *idx, &PREV);
++*idx;
xfs_iext_insert(ip, *idx, 1, new, state);
@@ -2437,7 +2438,6 @@ xfs_bmap_add_extent_unwritten_real(
*/
old = PREV;
PREV.br_blockcount = new->br_startoff - PREV.br_startoff;
- xfs_iext_update_extent(ip, state, *idx, &PREV);
r[0] = *new;
r[1].br_startoff = new_endoff;
@@ -2446,6 +2446,7 @@ xfs_bmap_add_extent_unwritten_real(
r[1].br_startblock = new->br_startblock + new->br_blockcount;
r[1].br_state = PREV.br_state;
+ xfs_iext_update_extent(ip, state, *idx, &PREV);
++*idx;
xfs_iext_insert(ip, *idx, 2, &r[0], state);
--
2.7.4