From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 13/19] xfs: refactor delalloc accounting in xfs_bmap_add_extent_delay_real
Date: Mon, 18 Sep 2017 08:24:16 -0700 [thread overview]
Message-ID: <20170918152422.24345-14-hch@lst.de> (raw)
In-Reply-To: <20170918152422.24345-1-hch@lst.de>
Account for all changes to the delalloc reservation in da_new, and use a
single call xfs_mod_fdblocks to reserve/free blocks, including always
checking for an error.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_bmap.c | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 731854cc8b58..dbf87add4d6b 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -1587,7 +1587,6 @@ xfs_bmap_add_extent_delay_real(
int whichfork)
{
struct xfs_bmbt_irec *new = &bma->got;
- int diff; /* temp value */
int error; /* error return value */
int i; /* temp state */
xfs_ifork_t *ifp; /* inode fork pointer */
@@ -2085,17 +2084,6 @@ xfs_bmap_add_extent_delay_real(
da_new = startblockval(PREV.br_blockcount) +
startblockval(RIGHT.br_blockcount);
- diff = da_new - startblockval(old.br_startblock);
- if (bma->cur)
- diff += bma->cur->bc_private.b.allocated;
- if (diff > 0) {
- error = xfs_mod_fdblocks(bma->ip->i_mount,
- -((int64_t)diff), false);
- ASSERT(!error);
- if (error)
- goto done;
- }
-
bma->idx++;
break;
@@ -2130,19 +2118,17 @@ xfs_bmap_add_extent_delay_real(
goto done;
}
- /* adjust for changes in reserved delayed indirect blocks */
- if (da_old || da_new) {
- temp = da_new;
- if (bma->cur)
- temp += bma->cur->bc_private.b.allocated;
- if (temp < da_old)
- xfs_mod_fdblocks(bma->ip->i_mount,
- (int64_t)(da_old - temp), false);
+ if (bma->cur) {
+ da_new += bma->cur->bc_private.b.allocated;
+ bma->cur->bc_private.b.allocated = 0;
}
- /* clear out the allocated field, done with it now in any case. */
- if (bma->cur)
- bma->cur->bc_private.b.allocated = 0;
+ /* adjust for changes in reserved delayed indirect blocks */
+ if (da_new != da_old) {
+ ASSERT(state == 0 || da_new < da_old);
+ error = xfs_mod_fdblocks(mp, (int64_t)(da_old - da_new),
+ false);
+ }
xfs_bmap_check_leaf_extents(bma->cur, bma->ip, whichfork);
done:
--
2.14.1
next prev parent reply other threads:[~2017-09-18 15:24 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
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 ` Christoph Hellwig [this message]
2017-09-19 16:35 ` [PATCH 13/19] xfs: refactor delalloc accounting in xfs_bmap_add_extent_delay_real 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 13/19] xfs: refactor delalloc accounting in xfs_bmap_add_extent_delay_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=20170918152422.24345-14-hch@lst.de \
--to=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).