From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
darrick.wong@oracle.com, david@fromorbit.com, hch@infradead.org
Subject: [PATCH V7 13/14] xfs: Process allocated extent in a separate function
Date: Mon, 19 Oct 2020 12:10:47 +0530 [thread overview]
Message-ID: <20201019064048.6591-14-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20201019064048.6591-1-chandanrlinux@gmail.com>
This commit moves over the code in xfs_bmap_btalloc() which is
responsible for processing an allocated extent to a new function. Apart
from xfs_bmap_btalloc(), the new function will be invoked by another
function introduced in a future commit.
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_bmap.c | 74 ++++++++++++++++++++++++----------------
1 file changed, 45 insertions(+), 29 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 935f2d506748..88db23afc51c 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3509,6 +3509,48 @@ xfs_bmap_compute_alignments(
}
}
+static void
+xfs_bmap_process_allocated_extent(
+ struct xfs_bmalloca *ap,
+ struct xfs_alloc_arg *args,
+ xfs_fileoff_t orig_offset,
+ xfs_extlen_t orig_length)
+{
+ int nullfb;
+
+ nullfb = ap->tp->t_firstblock == NULLFSBLOCK;
+
+ /*
+ * check the allocation happened at the same or higher AG than
+ * the first block that was allocated.
+ */
+ ASSERT(nullfb ||
+ XFS_FSB_TO_AGNO(args->mp, ap->tp->t_firstblock) <=
+ XFS_FSB_TO_AGNO(args->mp, args->fsbno));
+
+ ap->blkno = args->fsbno;
+ if (nullfb)
+ ap->tp->t_firstblock = args->fsbno;
+ ap->length = args->len;
+ /*
+ * If the extent size hint is active, we tried to round the
+ * caller's allocation request offset down to extsz and the
+ * length up to another extsz boundary. If we found a free
+ * extent we mapped it in starting at this new offset. If the
+ * newly mapped space isn't long enough to cover any of the
+ * range of offsets that was originally requested, move the
+ * mapping up so that we can fill as much of the caller's
+ * original request as possible. Free space is apparently
+ * very fragmented so we're unlikely to be able to satisfy the
+ * hints anyway.
+ */
+ if (ap->length <= orig_length)
+ ap->offset = orig_offset;
+ else if (ap->offset + ap->length < orig_offset + orig_length)
+ ap->offset = orig_offset + orig_length - ap->length;
+ xfs_bmap_btalloc_accounting(ap, args);
+}
+
STATIC int
xfs_bmap_btalloc(
struct xfs_bmalloca *ap) /* bmap alloc argument struct */
@@ -3701,36 +3743,10 @@ xfs_bmap_btalloc(
return error;
ap->tp->t_flags |= XFS_TRANS_LOWMODE;
}
+
if (args.fsbno != NULLFSBLOCK) {
- /*
- * check the allocation happened at the same or higher AG than
- * the first block that was allocated.
- */
- ASSERT(ap->tp->t_firstblock == NULLFSBLOCK ||
- XFS_FSB_TO_AGNO(mp, ap->tp->t_firstblock) <=
- XFS_FSB_TO_AGNO(mp, args.fsbno));
-
- ap->blkno = args.fsbno;
- if (ap->tp->t_firstblock == NULLFSBLOCK)
- ap->tp->t_firstblock = args.fsbno;
- ap->length = args.len;
- /*
- * If the extent size hint is active, we tried to round the
- * caller's allocation request offset down to extsz and the
- * length up to another extsz boundary. If we found a free
- * extent we mapped it in starting at this new offset. If the
- * newly mapped space isn't long enough to cover any of the
- * range of offsets that was originally requested, move the
- * mapping up so that we can fill as much of the caller's
- * original request as possible. Free space is apparently
- * very fragmented so we're unlikely to be able to satisfy the
- * hints anyway.
- */
- if (ap->length <= orig_length)
- ap->offset = orig_offset;
- else if (ap->offset + ap->length < orig_offset + orig_length)
- ap->offset = orig_offset + orig_length - ap->length;
- xfs_bmap_btalloc_accounting(ap, &args);
+ xfs_bmap_process_allocated_extent(ap, &args, orig_offset,
+ orig_length);
} else {
ap->blkno = NULLFSBLOCK;
ap->length = 0;
--
2.28.0
next prev parent reply other threads:[~2020-10-19 6:41 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 6:40 [PATCH V7 00/14] Bail out if transaction can cause extent count to overflow Chandan Babu R
2020-10-19 6:40 ` [PATCH V7 01/14] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2020-10-24 19:28 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 02/14] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2020-10-24 19:28 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 03/14] xfs: Check for extent overflow when punching a hole Chandan Babu R
2020-10-24 19:28 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 04/14] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2020-10-24 19:29 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 05/14] xfs: Check for extent overflow when adding/removing dir entries Chandan Babu R
2020-10-24 20:18 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 06/14] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2020-10-24 20:18 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 07/14] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2020-10-24 20:18 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 08/14] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2020-10-24 20:32 ` Allison Henderson
2020-10-26 23:10 ` Darrick J. Wong
2020-10-19 6:40 ` [PATCH V7 09/14] xfs: Check for extent overflow when swapping extents Chandan Babu R
2020-10-24 20:41 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 10/14] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2020-10-24 20:44 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 11/14] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2020-10-24 22:21 ` Allison Henderson
2020-10-26 23:11 ` Darrick J. Wong
2020-10-19 6:40 ` [PATCH V7 12/14] xfs: Compute bmap extent alignments in a separate function Chandan Babu R
2020-10-24 22:25 ` Allison Henderson
2020-10-19 6:40 ` Chandan Babu R [this message]
2020-10-24 23:15 ` [PATCH V7 13/14] xfs: Process allocated extent " Allison Henderson
2020-10-19 6:40 ` [PATCH V7 14/14] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2020-10-25 1:22 ` Allison Henderson
2020-10-26 3:23 ` Chandan Babu R
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=20201019064048.6591-14-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.