From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 09/19] xfs: refactor xfs_del_extent_real
Date: Wed, 20 Sep 2017 14:42:37 -0700 [thread overview]
Message-ID: <20170920214237.GP7112@magnolia> (raw)
In-Reply-To: <20170918152422.24345-10-hch@lst.de>
On Mon, Sep 18, 2017 at 08:24:12AM -0700, Christoph Hellwig wrote:
> Use xfs_iext_update_extent to update entries in the in-core extent list.
> This isolates the function from the detailed layout of the extent list,
> and generally makes the code a lot more readable.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_bmap.c | 60 ++++++++++++++++++++++++------------------------
> 1 file changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 037efc97499f..bd00f4d135af 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -5078,10 +5078,9 @@ xfs_bmap_del_extent_real(
> xfs_fsblock_t del_endblock=0; /* first block past del */
> xfs_fileoff_t del_endoff; /* first offset past del */
> int do_fx; /* free extent at end of routine */
> - xfs_bmbt_rec_host_t *ep; /* current extent entry pointer */
> int error; /* error return value */
> int flags = 0;/* inode logging flags */
> - xfs_bmbt_irec_t got; /* current extent entry */
> + struct xfs_bmbt_irec got; /* current extent entry */
> xfs_fileoff_t got_endoff; /* first offset past got */
> int i; /* temp state */
> xfs_ifork_t *ifp; /* inode fork pointer */
> @@ -5090,9 +5089,8 @@ xfs_bmap_del_extent_real(
> xfs_bmbt_irec_t new; /* new record to be inserted */
> /* REFERENCED */
> uint qfield; /* quota field to update */
> - xfs_filblks_t temp; /* for indirect length calculations */
> - xfs_filblks_t temp2; /* for indirect length calculations */
> int state = 0;
> + struct xfs_bmbt_irec old;
>
> mp = ip->i_mount;
> XFS_STATS_INC(mp, xs_del_exlist);
> @@ -5105,8 +5103,7 @@ xfs_bmap_del_extent_real(
> ifp = XFS_IFORK_PTR(ip, whichfork);
> ASSERT((*idx >= 0) && (*idx < xfs_iext_count(ifp)));
> ASSERT(del->br_blockcount > 0);
> - ep = xfs_iext_get_ext(ifp, *idx);
> - xfs_bmbt_get_all(ep, &got);
> + xfs_iext_get_extent(ifp, *idx, &got);
> ASSERT(got.br_startoff <= del->br_startoff);
> del_endoff = del->br_startoff + del->br_blockcount;
> got_endoff = got.br_startoff + got.br_blockcount;
> @@ -5193,54 +5190,56 @@ xfs_bmap_del_extent_real(
> * Deleting the first part of the extent.
> */
> trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);
> - xfs_bmbt_set_startoff(ep, del_endoff);
> - temp = got.br_blockcount - del->br_blockcount;
> - xfs_bmbt_set_blockcount(ep, temp);
> - xfs_bmbt_set_startblock(ep, del_endblock);
> + got.br_startoff = del_endoff;
> + got.br_startblock = del_endblock;
> + got.br_blockcount -= del->br_blockcount;
> + xfs_iext_update_extent(ifp, *idx, &got);
> trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);
> if (!cur) {
> flags |= xfs_ilog_fext(whichfork);
> break;
> }
> - if ((error = xfs_bmbt_update(cur, del_endoff, del_endblock,
> - got.br_blockcount - del->br_blockcount,
> - got.br_state)))
> + error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
> + got.br_blockcount, got.br_state);
> + if (error)
> goto done;
> break;
> case BMAP_RIGHT_FILLING:
> /*
> * Deleting the last part of the extent.
> */
> - temp = got.br_blockcount - del->br_blockcount;
> trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);
> - xfs_bmbt_set_blockcount(ep, temp);
> + got.br_blockcount -= del->br_blockcount;
> + xfs_iext_update_extent(ifp, *idx, &got);
> trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);
> if (!cur) {
> flags |= xfs_ilog_fext(whichfork);
> break;
> }
> - if ((error = xfs_bmbt_update(cur, got.br_startoff,
> - got.br_startblock,
> - got.br_blockcount - del->br_blockcount,
> - got.br_state)))
> + error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
> + got.br_blockcount, got.br_state);
> + if (error)
> goto done;
> break;
> case 0:
> /*
> * Deleting the middle of the extent.
> */
> - temp = del->br_startoff - got.br_startoff;
> trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);
> - xfs_bmbt_set_blockcount(ep, temp);
> +
> + old = got;
> + got.br_blockcount = del->br_startoff - got.br_startoff;
> + xfs_iext_update_extent(ifp, *idx, &got);
> +
> new.br_startoff = del_endoff;
> - temp2 = got_endoff - del_endoff;
> - new.br_blockcount = temp2;
> + new.br_blockcount = got_endoff - del_endoff;
> new.br_state = got.br_state;
> new.br_startblock = del_endblock;
> +
> flags |= XFS_ILOG_CORE;
> if (cur) {
> error = xfs_bmbt_update(cur, got.br_startoff,
> - got.br_startblock, temp,
> + got.br_startblock, got.br_blockcount,
> got.br_state);
> if (error)
> goto done;
> @@ -5262,7 +5261,8 @@ xfs_bmap_del_extent_real(
> * insert operation.
> */
> error = xfs_bmbt_lookup_eq(cur, got.br_startoff,
> - got.br_startblock, temp, &i);
> + got.br_startblock,
> + got.br_blockcount, &i);
> if (error)
> goto done;
> XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
> @@ -5270,17 +5270,17 @@ xfs_bmap_del_extent_real(
> * Update the btree record back
> * to the original value.
> */
> - error = xfs_bmbt_update(cur, got.br_startoff,
> - got.br_startblock,
> - got.br_blockcount,
> - got.br_state);
> + error = xfs_bmbt_update(cur, old.br_startoff,
> + old.br_startblock,
> + old.br_blockcount,
> + old.br_state);
> if (error)
> goto done;
> /*
> * Reset the extent record back
> * to the original value.
> */
> - xfs_bmbt_set_blockcount(ep, got.br_blockcount);
> + xfs_iext_update_extent(ifp, *idx, &old);
> flags = 0;
> error = -ENOSPC;
> goto done;
> --
> 2.14.1
>
> --
> 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-09-20 21:42 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-18 15:24 refactor extent manipulation V3 Christoph Hellwig
2017-09-18 15:24 ` [PATCH 01/19] xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-20 21:20 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 02/19] xfs: use xfs_iext_get_extent instead of open coding it Christoph Hellwig
2017-09-20 21:20 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 03/19] xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi Christoph Hellwig
2017-09-20 21:29 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 04/19] xfs: rename bno to end in __xfs_bunmapi Christoph Hellwig
2017-09-20 21:30 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 05/19] xfs: use xfs_bmap_del_extent_delay for the data fork as well Christoph Hellwig
2017-09-20 21:46 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 06/19] xfs: move some more code into xfs_bmap_del_extent_real Christoph Hellwig
2017-09-20 21:37 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 07/19] xfs: use correct state defines in xfs_bmap_del_extent_{cow,delay} Christoph Hellwig
2017-09-20 21:38 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 08/19] xfs: use the state defines in xfs_bmap_del_extent_real Christoph Hellwig
2017-09-20 21:41 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 09/19] xfs: refactor xfs_del_extent_real Christoph Hellwig
2017-09-20 21:42 ` Darrick J. Wong [this message]
2017-09-18 15:24 ` [PATCH 10/19] xfs: refactor xfs_bmap_add_extent_hole_delay Christoph Hellwig
2017-09-20 21:44 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 11/19] xfs: refactor xfs_bmap_add_extent_hole_real Christoph Hellwig
2017-09-20 21:45 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 12/19] xfs: refactor xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-09-19 16:35 ` Brian Foster
2017-09-21 13:27 ` Christoph Hellwig
2017-09-21 13:52 ` Brian Foster
2017-09-20 22:03 ` Darrick J. Wong
2017-09-21 13:28 ` Christoph Hellwig
2017-09-21 16:01 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 13/19] xfs: refactor delalloc accounting in xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-09-19 16:35 ` Brian Foster
2017-09-20 22:12 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 14/19] xfs: refactor xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-20 22:22 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 15/19] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_update Christoph Hellwig
2017-09-20 22:24 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 16/19] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_lookup_eq Christoph Hellwig
2017-09-20 22:27 ` Darrick J. Wong
2017-09-21 13:23 ` Christoph Hellwig
2017-09-21 15:34 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 17/19] xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first Christoph Hellwig
2017-09-20 22:27 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 18/19] xfs: remove all xfs_bmbt_set_* helpers except for xfs_bmbt_set_all Christoph Hellwig
2017-09-20 22:27 ` Darrick J. Wong
2017-09-18 15:24 ` [PATCH 19/19] xfs: remove xfs_bmbt_get_state Christoph Hellwig
2017-09-20 22:28 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2017-09-22 13:59 refactor extent manipulation V4 Christoph Hellwig
2017-09-22 13:59 ` [PATCH 09/19] xfs: refactor xfs_del_extent_real Christoph Hellwig
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=20170920214237.GP7112@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).