forked from Minki/linux
xfs: treat idx as a cursor in xfs_bmap_add_extent_unwritten_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>
This commit is contained in:
parent
1d2e0089e1
commit
a681847796
@ -2152,12 +2152,11 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
* Setting all of a previous oldext extent to newext.
|
* Setting all of a previous oldext extent to newext.
|
||||||
* The left and right neighbors are both contiguous with new.
|
* The left and right neighbors are both contiguous with new.
|
||||||
*/
|
*/
|
||||||
--*idx;
|
|
||||||
|
|
||||||
LEFT.br_blockcount += PREV.br_blockcount + RIGHT.br_blockcount;
|
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_NEXT_SET(ip, whichfork,
|
||||||
XFS_IFORK_NEXTENTS(ip, whichfork) - 2);
|
XFS_IFORK_NEXTENTS(ip, whichfork) - 2);
|
||||||
if (cur == NULL)
|
if (cur == NULL)
|
||||||
@ -2191,12 +2190,11 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
* Setting all of a previous oldext extent to newext.
|
* Setting all of a previous oldext extent to newext.
|
||||||
* The left neighbor is contiguous, the right is not.
|
* The left neighbor is contiguous, the right is not.
|
||||||
*/
|
*/
|
||||||
--*idx;
|
|
||||||
|
|
||||||
LEFT.br_blockcount += PREV.br_blockcount;
|
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_NEXT_SET(ip, whichfork,
|
||||||
XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
|
XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
|
||||||
if (cur == NULL)
|
if (cur == NULL)
|
||||||
@ -2226,9 +2224,12 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
*/
|
*/
|
||||||
PREV.br_blockcount += RIGHT.br_blockcount;
|
PREV.br_blockcount += RIGHT.br_blockcount;
|
||||||
PREV.br_state = new->br_state;
|
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_update_extent(ip, state, *idx, &PREV);
|
||||||
|
|
||||||
xfs_iext_remove(ip, *idx + 1, 1, state);
|
|
||||||
XFS_IFORK_NEXT_SET(ip, whichfork,
|
XFS_IFORK_NEXT_SET(ip, whichfork,
|
||||||
XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
|
XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
|
||||||
if (cur == NULL)
|
if (cur == NULL)
|
||||||
@ -2280,15 +2281,15 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
* The left neighbor is contiguous.
|
* The left neighbor is contiguous.
|
||||||
*/
|
*/
|
||||||
LEFT.br_blockcount += new->br_blockcount;
|
LEFT.br_blockcount += new->br_blockcount;
|
||||||
xfs_iext_update_extent(ip, state, *idx - 1, &LEFT);
|
|
||||||
|
|
||||||
old = PREV;
|
old = PREV;
|
||||||
PREV.br_startoff += new->br_blockcount;
|
PREV.br_startoff += new->br_blockcount;
|
||||||
PREV.br_startblock += new->br_blockcount;
|
PREV.br_startblock += new->br_blockcount;
|
||||||
PREV.br_blockcount -= 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;
|
--*idx;
|
||||||
|
xfs_iext_update_extent(ip, state, *idx, &LEFT);
|
||||||
|
|
||||||
if (cur == NULL)
|
if (cur == NULL)
|
||||||
rval = XFS_ILOG_DEXT;
|
rval = XFS_ILOG_DEXT;
|
||||||
@ -2319,8 +2320,8 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
PREV.br_startoff += new->br_blockcount;
|
PREV.br_startoff += new->br_blockcount;
|
||||||
PREV.br_startblock += new->br_blockcount;
|
PREV.br_startblock += new->br_blockcount;
|
||||||
PREV.br_blockcount -= 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_iext_insert(ip, *idx, 1, new, state);
|
||||||
XFS_IFORK_NEXT_SET(ip, whichfork,
|
XFS_IFORK_NEXT_SET(ip, whichfork,
|
||||||
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
|
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
|
||||||
@ -2349,13 +2350,13 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
*/
|
*/
|
||||||
old = PREV;
|
old = PREV;
|
||||||
PREV.br_blockcount -= new->br_blockcount;
|
PREV.br_blockcount -= new->br_blockcount;
|
||||||
xfs_iext_update_extent(ip, state, *idx, &PREV);
|
|
||||||
|
|
||||||
++*idx;
|
|
||||||
|
|
||||||
RIGHT.br_startoff = new->br_startoff;
|
RIGHT.br_startoff = new->br_startoff;
|
||||||
RIGHT.br_startblock = new->br_startblock;
|
RIGHT.br_startblock = new->br_startblock;
|
||||||
RIGHT.br_blockcount += new->br_blockcount;
|
RIGHT.br_blockcount += new->br_blockcount;
|
||||||
|
|
||||||
|
xfs_iext_update_extent(ip, state, *idx, &PREV);
|
||||||
|
++*idx;
|
||||||
xfs_iext_update_extent(ip, state, *idx, &RIGHT);
|
xfs_iext_update_extent(ip, state, *idx, &RIGHT);
|
||||||
|
|
||||||
if (cur == NULL)
|
if (cur == NULL)
|
||||||
@ -2385,8 +2386,8 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
*/
|
*/
|
||||||
old = PREV;
|
old = PREV;
|
||||||
PREV.br_blockcount -= 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;
|
++*idx;
|
||||||
xfs_iext_insert(ip, *idx, 1, new, state);
|
xfs_iext_insert(ip, *idx, 1, new, state);
|
||||||
|
|
||||||
@ -2421,7 +2422,6 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
*/
|
*/
|
||||||
old = PREV;
|
old = PREV;
|
||||||
PREV.br_blockcount = new->br_startoff - PREV.br_startoff;
|
PREV.br_blockcount = new->br_startoff - PREV.br_startoff;
|
||||||
xfs_iext_update_extent(ip, state, *idx, &PREV);
|
|
||||||
|
|
||||||
r[0] = *new;
|
r[0] = *new;
|
||||||
r[1].br_startoff = new_endoff;
|
r[1].br_startoff = new_endoff;
|
||||||
@ -2430,6 +2430,7 @@ xfs_bmap_add_extent_unwritten_real(
|
|||||||
r[1].br_startblock = new->br_startblock + new->br_blockcount;
|
r[1].br_startblock = new->br_startblock + new->br_blockcount;
|
||||||
r[1].br_state = PREV.br_state;
|
r[1].br_state = PREV.br_state;
|
||||||
|
|
||||||
|
xfs_iext_update_extent(ip, state, *idx, &PREV);
|
||||||
++*idx;
|
++*idx;
|
||||||
xfs_iext_insert(ip, *idx, 2, &r[0], state);
|
xfs_iext_insert(ip, *idx, 2, &r[0], state);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user