Re: [PATCH 06/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_unwritten_real

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Oct 31, 2017 at 04:22:18PM +0200, Christoph Hellwig wrote:
> 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@xxxxxx>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>

> ---
>  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 7bd27c08981f..10878c495869 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -2151,12 +2151,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)
> @@ -2190,12 +2189,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)
> @@ -2225,9 +2223,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)
> @@ -2279,15 +2280,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;
> @@ -2318,8 +2319,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);
> @@ -2348,13 +2349,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)
> @@ -2384,8 +2385,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);
>  
> @@ -2420,7 +2421,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;
> @@ -2429,6 +2429,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.14.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux