From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 06/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_unwritten_real
Date: Tue, 31 Oct 2017 14:36:41 -0700 [thread overview]
Message-ID: <20171031213641.GO4911@magnolia> (raw)
In-Reply-To: <20171031142230.11755-7-hch@lst.de>
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@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.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 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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-10-31 21:36 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 14:22 b+tree for the incore extent list Christoph Hellwig
2017-10-31 14:22 ` [PATCH 01/18] xfs: pass an on-disk extent to xfs_bmbt_validate_extent Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:15 ` Darrick J. Wong
2017-11-01 13:58 ` Brian Foster
2017-11-01 23:00 ` Darrick J. Wong
2017-11-02 11:57 ` Brian Foster
2017-11-02 16:05 ` Darrick J. Wong
2017-11-02 16:54 ` Brian Foster
2017-11-02 18:42 ` Christoph Hellwig
2017-11-02 19:35 ` Brian Foster
2017-11-02 23:45 ` Dave Chinner
2017-10-31 14:22 ` [PATCH 02/18] xfs: don't create overlapping extents in xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:34 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 03/18] xfs: treat idx as a cursor " Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:35 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 04/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_hole_delay Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:35 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 05/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_hole_real Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:35 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 06/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:36 ` Darrick J. Wong [this message]
2017-10-31 14:22 ` [PATCH 07/18] xfs: treat idx as a cursor in xfs_bmap_del_extent_* Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:37 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 08/18] xfs: treat idx as a cursor in xfs_bmap_collapse_extents Christoph Hellwig
2017-10-31 17:53 ` Brian Foster
2017-10-31 21:37 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 09/18] xfs: allow unaligned extent records in xfs_bmbt_disk_set_all Christoph Hellwig
2017-10-31 21:34 ` Darrick J. Wong
2017-11-02 13:54 ` Brian Foster
2017-10-31 14:22 ` [PATCH 10/18] xfs: iterate over extents in xfs_iextents_copy Christoph Hellwig
2017-10-31 21:41 ` Darrick J. Wong
2017-11-02 13:54 ` Brian Foster
2017-10-31 14:22 ` [PATCH 11/18] xfs: iterate over extents in xfs_bmap_extents_to_btree Christoph Hellwig
2017-10-31 21:41 ` Darrick J. Wong
2017-11-02 13:54 ` Brian Foster
2017-10-31 14:22 ` [PATCH 12/18] xfs: introduce the xfs_iext_cursor abstraction Christoph Hellwig
2017-10-31 22:02 ` Darrick J. Wong
2017-11-02 18:49 ` Christoph Hellwig
2017-11-02 19:01 ` Darrick J. Wong
2017-11-02 19:11 ` Christoph Hellwig
2017-11-02 17:14 ` Brian Foster
2017-11-02 18:51 ` Christoph Hellwig
2017-11-02 19:36 ` Brian Foster
2017-11-03 7:26 ` Christoph Hellwig
2017-10-31 14:22 ` [PATCH 13/18] xfs: iterate backwards in xfs_reflink_cancel_cow_blocks Christoph Hellwig
2017-10-31 22:10 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 14/18] xfs: simplify xfs_reflink_convert_cow Christoph Hellwig
2017-10-31 22:20 ` Darrick J. Wong
2017-11-02 18:56 ` Christoph Hellwig
2017-10-31 14:22 ` [PATCH 15/18] xfs: remove support for inlining data/extents into the inode fork Christoph Hellwig
2017-10-31 22:35 ` Darrick J. Wong
2017-11-02 18:57 ` Christoph Hellwig
2017-11-02 19:26 ` Darrick J. Wong
2017-11-02 21:43 ` Dave Chinner
2017-11-02 22:08 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 16/18] xfs: use a b+tree for the in-core extent list Christoph Hellwig
2017-11-01 18:47 ` Darrick J. Wong
2017-11-02 0:16 ` Darrick J. Wong
2017-11-02 6:03 ` Christoph Hellwig
2017-11-02 0:14 ` Darrick J. Wong
2017-11-02 19:09 ` Christoph Hellwig
2017-10-31 14:22 ` [PATCH 17/18] xfs: remove the nr_extents argument to xfs_iext_insert Christoph Hellwig
2017-10-31 22:35 ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 18/18] xfs: remove the nr_extents argument to xfs_iext_remove Christoph Hellwig
2017-10-31 22:37 ` Darrick J. Wong
2017-11-01 3:08 ` b+tree for the incore extent list Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171031213641.GO4911@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).