From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
djwong@kernel.org, hch@lst.de, allison.henderson@oracle.com,
kernel test robot <lkp@intel.com>
Subject: [PATCH V15 14/16] xfs: Compute bmap extent alignments in a separate function
Date: Tue, 26 Jan 2021 12:02:30 +0530 [thread overview]
Message-ID: <20210126063232.3648053-15-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20210126063232.3648053-1-chandanrlinux@gmail.com>
This commit moves over the code which computes stripe alignment and
extent size hint alignment into a separate function. Apart from
xfs_bmap_btalloc(), the new function will be used by another function
introduced in a future commit.
Reported-by: kernel test robot <lkp@intel.com> # Unused variable warning
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_bmap.c | 89 +++++++++++++++++++++++-----------------
1 file changed, 52 insertions(+), 37 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 0b15b1ff4bdd..a0e8968e473d 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3463,13 +3463,59 @@ xfs_bmap_btalloc_accounting(
args->len);
}
+static int
+xfs_bmap_compute_alignments(
+ struct xfs_bmalloca *ap,
+ struct xfs_alloc_arg *args)
+{
+ struct xfs_mount *mp = args->mp;
+ xfs_extlen_t align = 0; /* minimum allocation alignment */
+ int stripe_align = 0;
+
+ /* stripe alignment for allocation is determined by mount parameters */
+ if (mp->m_swidth && (mp->m_flags & XFS_MOUNT_SWALLOC))
+ stripe_align = mp->m_swidth;
+ else if (mp->m_dalign)
+ stripe_align = mp->m_dalign;
+
+ if (ap->flags & XFS_BMAPI_COWFORK)
+ align = xfs_get_cowextsz_hint(ap->ip);
+ else if (ap->datatype & XFS_ALLOC_USERDATA)
+ align = xfs_get_extsz_hint(ap->ip);
+ if (align) {
+ if (xfs_bmap_extsize_align(mp, &ap->got, &ap->prev,
+ align, 0, ap->eof, 0, ap->conv, &ap->offset,
+ &ap->length))
+ ASSERT(0);
+
+ ASSERT(ap->length);
+ }
+
+ /* apply extent size hints if obtained earlier */
+ if (align) {
+ args->prod = align;
+ div_u64_rem(ap->offset, args->prod, &args->mod);
+ if (args->mod)
+ args->mod = args->prod - args->mod;
+ } else if (mp->m_sb.sb_blocksize >= PAGE_SIZE) {
+ args->prod = 1;
+ args->mod = 0;
+ } else {
+ args->prod = PAGE_SIZE >> mp->m_sb.sb_blocklog;
+ div_u64_rem(ap->offset, args->prod, &args->mod);
+ if (args->mod)
+ args->mod = args->prod - args->mod;
+ }
+
+ return stripe_align;
+}
+
STATIC int
xfs_bmap_btalloc(
struct xfs_bmalloca *ap) /* bmap alloc argument struct */
{
xfs_mount_t *mp; /* mount point structure */
xfs_alloctype_t atype = 0; /* type for allocation routines */
- xfs_extlen_t align = 0; /* minimum allocation alignment */
xfs_agnumber_t fb_agno; /* ag number of ap->firstblock */
xfs_agnumber_t ag;
xfs_alloc_arg_t args;
@@ -3489,25 +3535,11 @@ xfs_bmap_btalloc(
mp = ap->ip->i_mount;
- /* stripe alignment for allocation is determined by mount parameters */
- stripe_align = 0;
- if (mp->m_swidth && (mp->m_flags & XFS_MOUNT_SWALLOC))
- stripe_align = mp->m_swidth;
- else if (mp->m_dalign)
- stripe_align = mp->m_dalign;
-
- if (ap->flags & XFS_BMAPI_COWFORK)
- align = xfs_get_cowextsz_hint(ap->ip);
- else if (ap->datatype & XFS_ALLOC_USERDATA)
- align = xfs_get_extsz_hint(ap->ip);
- if (align) {
- error = xfs_bmap_extsize_align(mp, &ap->got, &ap->prev,
- align, 0, ap->eof, 0, ap->conv,
- &ap->offset, &ap->length);
- ASSERT(!error);
- ASSERT(ap->length);
- }
+ memset(&args, 0, sizeof(args));
+ args.tp = ap->tp;
+ args.mp = mp;
+ stripe_align = xfs_bmap_compute_alignments(ap, &args);
nullfb = ap->tp->t_firstblock == NULLFSBLOCK;
fb_agno = nullfb ? NULLAGNUMBER : XFS_FSB_TO_AGNO(mp,
@@ -3538,9 +3570,6 @@ xfs_bmap_btalloc(
* Normal allocation, done through xfs_alloc_vextent.
*/
tryagain = isaligned = 0;
- memset(&args, 0, sizeof(args));
- args.tp = ap->tp;
- args.mp = mp;
args.fsbno = ap->blkno;
args.oinfo = XFS_RMAP_OINFO_SKIP_UPDATE;
@@ -3571,21 +3600,7 @@ xfs_bmap_btalloc(
args.total = ap->total;
args.minlen = ap->minlen;
}
- /* apply extent size hints if obtained earlier */
- if (align) {
- args.prod = align;
- div_u64_rem(ap->offset, args.prod, &args.mod);
- if (args.mod)
- args.mod = args.prod - args.mod;
- } else if (mp->m_sb.sb_blocksize >= PAGE_SIZE) {
- args.prod = 1;
- args.mod = 0;
- } else {
- args.prod = PAGE_SIZE >> mp->m_sb.sb_blocklog;
- div_u64_rem(ap->offset, args.prod, &args.mod);
- if (args.mod)
- args.mod = args.prod - args.mod;
- }
+
/*
* If we are not low on available data blocks, and the underlying
* logical volume manager is a stripe, and the file offset is zero then
--
2.29.2
next prev parent reply other threads:[~2021-01-26 18:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 6:32 [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 01/16] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 02/16] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 03/16] xfs: Check for extent overflow when punching a hole Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 04/16] xfs: Check for extent overflow when adding dir entries Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 05/16] xfs: Check for extent overflow when removing " Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 06/16] xfs: Check for extent overflow when renaming " Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 07/16] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 08/16] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 09/16] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 10/16] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 11/16] xfs: Check for extent overflow when swapping extents Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 12/16] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 13/16] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2021-01-26 6:32 ` Chandan Babu R [this message]
2021-01-27 0:39 ` [PATCH V15 14/16] xfs: Compute bmap extent alignments in a separate function Allison Henderson
2021-01-26 6:32 ` [PATCH V15 15/16] xfs: Process allocated extent " Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 16/16] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2021-01-28 2:35 ` Allison Henderson
2021-01-26 18:00 ` [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow 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=20210126063232.3648053-15-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=allison.henderson@oracle.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
--cc=lkp@intel.com \
/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