From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 02/10] xfs: rewrite xfs_da_grow_inode_int
Date: Thu, 13 Apr 2017 10:05:09 +0200 [thread overview]
Message-ID: <20170413080517.12564-3-hch@lst.de> (raw)
In-Reply-To: <20170413080517.12564-1-hch@lst.de>
Use one xfs_bmapi_write loop that just iterates if it didn't manage to
allocate enough blocks. Get rid of the separate contig call that just
makes us call the allocator twice, and also get rid of the memory
allocation for the map array that we don't actually need.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_da_btree.c | 94 +++++++++++++-------------------------------
1 file changed, 28 insertions(+), 66 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index 1bdf2888295b..00853d332bcd 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -2007,84 +2007,46 @@ xfs_da_grow_inode_int(
xfs_fileoff_t *bno,
int count)
{
- struct xfs_trans *tp = args->trans;
- struct xfs_inode *dp = args->dp;
int w = args->whichfork;
- xfs_rfsblock_t nblks = dp->i_d.di_nblocks;
- struct xfs_bmbt_irec map, *mapp;
- int nmap, error, got, i, mapi;
+ xfs_fileoff_t b;
+ int error;
/*
* Find a spot in the file space to put the new block.
*/
- error = xfs_bmap_first_unused(tp, dp, count, bno, w);
+ error = xfs_bmap_first_unused(args->trans, args->dp, count, bno, w);
if (error)
return error;
- /*
- * Try mapping it in one filesystem block.
- */
- nmap = 1;
- ASSERT(args->firstblock != NULL);
- error = xfs_bmapi_write(tp, dp, *bno, count,
- xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG,
- args->firstblock, args->total, &map, &nmap,
- args->dfops);
- if (error)
- return error;
+ b = *bno;
+ do {
+ xfs_rfsblock_t nblks = args->dp->i_d.di_nblocks;
+ struct xfs_bmbt_irec imap;
+ xfs_extlen_t len;
+ int nmap = 1;
+
+ error = xfs_bmapi_write(args->trans, args->dp, b, count,
+ xfs_bmapi_aflag(w) | XFS_BMAPI_METADATA,
+ args->firstblock, args->total, &imap, &nmap,
+ args->dfops);
+ if (error)
+ return error;
+ if (!nmap)
+ return -ENOSPC;
- ASSERT(nmap <= 1);
- if (nmap == 1) {
- mapp = ↦
- mapi = 1;
- } else if (nmap == 0 && count > 1) {
- xfs_fileoff_t b;
- int c;
+ len = imap.br_startoff + imap.br_blockcount - b;
+ ASSERT(imap.br_startoff <= b);
+ ASSERT(len > 0);
+ ASSERT(len <= count);
- /*
- * If we didn't get it and the block might work if fragmented,
- * try without the CONTIG flag. Loop until we get it all.
- */
- mapp = kmem_alloc(sizeof(*mapp) * count, KM_SLEEP);
- for (b = *bno, mapi = 0; b < *bno + count; ) {
- nmap = MIN(XFS_BMAP_MAX_NMAP, count);
- c = (int)(*bno + count - b);
- error = xfs_bmapi_write(tp, dp, b, c,
- xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA,
- args->firstblock, args->total,
- &mapp[mapi], &nmap, args->dfops);
- if (error)
- goto out_free_map;
- if (nmap < 1)
- break;
- mapi += nmap;
- b = mapp[mapi - 1].br_startoff +
- mapp[mapi - 1].br_blockcount;
- }
- } else {
- mapi = 0;
- mapp = NULL;
- }
-
- /*
- * Count the blocks we got, make sure it matches the total.
- */
- for (i = 0, got = 0; i < mapi; i++)
- got += mapp[i].br_blockcount;
- if (got != count || mapp[0].br_startoff != *bno ||
- mapp[mapi - 1].br_startoff + mapp[mapi - 1].br_blockcount !=
- *bno + count) {
- error = -ENOSPC;
- goto out_free_map;
- }
+ /* account for newly allocated blocks in reserved blocks total */
+ args->total -= (args->dp->i_d.di_nblocks - nblks);
- /* account for newly allocated blocks in reserved blocks total */
- args->total -= dp->i_d.di_nblocks - nblks;
+ b += len;
+ count -= len;
+ } while (count > 0);
-out_free_map:
- if (mapp != &map)
- kmem_free(mapp);
- return error;
+ return 0;
}
/*
--
2.11.0
next prev parent reply other threads:[~2017-04-13 8:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 8:05 fix space reservations underneath xfs_bmapi_write Christoph Hellwig
2017-04-13 8:05 ` [PATCH 01/10] xfs: introduce xfs_trans_blk_res Christoph Hellwig
2017-04-13 18:28 ` Brian Foster
2017-04-13 8:05 ` Christoph Hellwig [this message]
2017-04-13 18:28 ` [PATCH 02/10] xfs: rewrite xfs_da_grow_inode_int Brian Foster
2017-04-13 8:05 ` [PATCH 03/10] xfs: remove the XFS_BMAPI_CONTIG flag Christoph Hellwig
2017-04-13 18:28 ` Brian Foster
2017-04-13 8:05 ` [PATCH 04/10] xfs: remove an unsafe retry in xfs_bmbt_alloc_block Christoph Hellwig
2017-04-13 18:30 ` Brian Foster
2017-04-14 7:46 ` Christoph Hellwig
2017-04-17 14:19 ` Brian Foster
2017-04-18 7:54 ` Christoph Hellwig
2017-04-18 14:18 ` Brian Foster
2017-04-25 7:30 ` Christoph Hellwig
2017-04-25 12:11 ` Brian Foster
2017-04-13 8:05 ` [PATCH 05/10] xfs: remove the total argument to xfs_bmap_local_to_extents Christoph Hellwig
2017-04-17 14:19 ` Brian Foster
2017-04-13 8:05 ` [PATCH 06/10] xfs: fix bmap minleft calculation Christoph Hellwig
2017-04-17 14:19 ` Brian Foster
2017-04-18 7:59 ` Christoph Hellwig
2017-04-13 8:05 ` [PATCH 07/10] xfs: fix space reservation in xfs_bmbt_alloc_block Christoph Hellwig
2017-04-17 14:19 ` Brian Foster
2017-04-13 8:05 ` [PATCH 08/10] xfs: introduce a XFS_BMAPI_BESTEFFORT flag Christoph Hellwig
2017-04-17 18:08 ` Brian Foster
2017-04-18 7:58 ` Christoph Hellwig
2017-04-18 14:18 ` Brian Foster
2017-04-13 8:05 ` [PATCH 09/10] xfs: kill the dop_low flag Christoph Hellwig
2017-04-17 18:08 ` Brian Foster
2017-04-13 8:05 ` [PATCH 10/10] xfs: remove xfs_bmap_alloc Christoph Hellwig
2017-04-17 18:08 ` Brian Foster
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=20170413080517.12564-3-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).