From: Chandan Rajendra <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Rajendra <chandanrlinux@gmail.com>,
david@fromorbit.com, chandan@linux.ibm.com,
darrick.wong@oracle.com, bfoster@redhat.com
Subject: [PATCH V4 2/7] xfs: xfs_attr_calc_size: Use local variables to track individual space components
Date: Sun, 23 Feb 2020 13:00:39 +0530 [thread overview]
Message-ID: <20200223073044.14215-2-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20200223073044.14215-1-chandanrlinux@gmail.com>
The size calculated by xfs_attr_calc_size() is a sum of three components,
1. Number of dabtree blocks
2. Number of Bmbt blocks
3. Number of remote blocks
This commit introduces new local variables to track these numbers explicitly.
Signed-off-by: Chandan Rajendra <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_attr.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 1875210cc8e40..942ba552e0bdd 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -142,8 +142,10 @@ xfs_attr_calc_size(
int *local)
{
struct xfs_mount *mp = args->dp->i_mount;
+ unsigned int total_dablks;
+ unsigned int bmbt_blks;
+ unsigned int rmt_blks;
int size;
- int nblks;
/*
* Determine space new attribute will use, and if it would be
@@ -151,23 +153,26 @@ xfs_attr_calc_size(
*/
size = xfs_attr_leaf_newentsize(args->geo, args->namelen,
args->valuelen, local);
- nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK);
+ total_dablks = XFS_DAENTER_BLOCKS(mp, XFS_ATTR_FORK);
+ bmbt_blks = XFS_DAENTER_BMAPS(mp, XFS_ATTR_FORK);
if (*local) {
if (size > (args->geo->blksize / 2)) {
/* Double split possible */
- nblks *= 2;
+ total_dablks *= 2;
+ bmbt_blks *= 2;
}
+ rmt_blks = 0;
} else {
/*
* Out of line attribute, cannot double split, but
* make room for the attribute value itself.
*/
- uint dblocks = xfs_attr3_rmt_blocks(mp, args->valuelen);
- nblks += dblocks;
- nblks += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK);
+ rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen);
+ bmbt_blks += XFS_NEXTENTADD_SPACE_RES(mp, rmt_blks,
+ XFS_ATTR_FORK);
}
- return nblks;
+ return total_dablks + rmt_blks + bmbt_blks;
}
STATIC int
--
2.19.1
next prev parent reply other threads:[~2020-02-23 7:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-23 7:30 [PATCH V4 1/7] xfs: Pass xattr name and value length explicitly to xfs_attr_leaf_newentsize Chandan Rajendra
2020-02-23 7:30 ` Chandan Rajendra [this message]
2020-02-23 7:30 ` [PATCH V4 3/7] xfs: xfs_attr_calc_size: Calculate Bmbt blks only once Chandan Rajendra
2020-02-23 7:30 ` [PATCH V4 4/7] xfs: Introduce struct xfs_attr_set_resv Chandan Rajendra
2020-02-23 7:30 ` [PATCH V4 5/7] xfs: xfs_attr_calc_size: Explicitly pass mp, namelen and valuelen args Chandan Rajendra
2020-02-23 7:30 ` [PATCH V4 6/7] xfs: Make xfs_attr_calc_size() non-static Chandan Rajendra
2020-02-23 7:30 ` [PATCH V4 7/7] xfs: Fix log reservation calculation for xattr insert operation Chandan Rajendra
2020-02-23 9:51 ` Amir Goldstein
2020-02-23 17:15 ` Chandan Rajendra
2020-02-23 7:31 [PATCH V4 1/7] xfs: Pass xattr name and value length explicitly to xfs_attr_leaf_newentsize Chandan Rajendra
2020-02-23 7:31 ` [PATCH V4 2/7] xfs: xfs_attr_calc_size: Use local variables to track individual space components Chandan Rajendra
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=20200223073044.14215-2-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=bfoster@redhat.com \
--cc=chandan@linux.ibm.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--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.