From: Brian Foster <bfoster@redhat.com>
To: Chandan Rajendra <chandanrlinux@gmail.com>
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com,
chandan@linux.ibm.com, darrick.wong@oracle.com,
amir73il@gmail.com
Subject: Re: [PATCH V4 RESEND 5/7] xfs: xfs_attr_calc_size: Explicitly pass mp, namelen and valuelen args
Date: Tue, 25 Feb 2020 11:27:49 -0500 [thread overview]
Message-ID: <20200225162749.GE54181@bfoster> (raw)
In-Reply-To: <20200224040044.30923-6-chandanrlinux@gmail.com>
On Mon, Feb 24, 2020 at 09:30:42AM +0530, Chandan Rajendra wrote:
> In a future commit, xfs_attr_calc_size() will be invoked from a function that
> does not have a 'struct xfs_da_args' handy. Hence this commit changes
> xfs_attr_calc_size() to let invokers to explicitly pass 'struct xfs_mount *',
> namelen and valuelen arguments.
>
> Signed-off-by: Chandan Rajendra <chandanrlinux@gmail.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_attr.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 921acac71e5d9..f781724bf85ce 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -138,22 +138,24 @@ xfs_attr_get(
> */
> STATIC void
> xfs_attr_calc_size(
> - struct xfs_da_args *args,
> + struct xfs_mount *mp,
> struct xfs_attr_set_resv *resv,
> + int namelen,
> + int valuelen,
> int *local)
> {
> - struct xfs_mount *mp = args->dp->i_mount;
> + unsigned int blksize = mp->m_attr_geo->blksize;
> int size;
>
> /*
> * Determine space new attribute will use, and if it would be
> * "local" or "remote" (note: local != inline).
> */
> - size = xfs_attr_leaf_newentsize(args->geo, args->namelen,
> - args->valuelen, local);
> + size = xfs_attr_leaf_newentsize(mp->m_attr_geo, namelen, valuelen,
> + local);
> resv->total_dablks = XFS_DAENTER_BLOCKS(mp, XFS_ATTR_FORK);
> if (*local) {
> - if (size > (args->geo->blksize / 2)) {
> + if (size > (blksize / 2)) {
> /* Double split possible */
> resv->total_dablks *= 2;
> }
> @@ -163,7 +165,7 @@ xfs_attr_calc_size(
> * Out of line attribute, cannot double split, but
> * make room for the attribute value itself.
> */
> - resv->rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen);
> + resv->rmt_blks = xfs_attr3_rmt_blocks(mp, valuelen);
> }
>
> resv->bmbt_blks = XFS_NEXTENTADD_SPACE_RES(mp,
> @@ -329,7 +331,8 @@ xfs_attr_set(
> XFS_STATS_INC(mp, xs_attr_set);
>
> args->op_flags |= XFS_DA_OP_ADDNAME;
> - xfs_attr_calc_size(args, &resv, &local);
> + xfs_attr_calc_size(mp, &resv, args->namelen, args->valuelen,
> + &local);
> args->total = resv.alloc_blks;
>
> /*
> --
> 2.19.1
>
next prev parent reply other threads:[~2020-02-25 16:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 4:00 [PATCH V4 RESEND 0/7] Fix log reservation calculation for xattr insert operation Chandan Rajendra
2020-02-24 4:00 ` [PATCH V4 RESEND 1/7] xfs: Pass xattr name and value length explicitly to xfs_attr_leaf_newentsize Chandan Rajendra
2020-02-25 16:11 ` Brian Foster
2020-02-26 16:58 ` Christoph Hellwig
2020-02-27 9:27 ` Chandan Rajendra
2020-02-24 4:00 ` [PATCH V4 RESEND 2/7] xfs: xfs_attr_calc_size: Use local variables to track individual space components Chandan Rajendra
2020-02-25 16:11 ` Brian Foster
2020-02-26 10:38 ` Chandan Rajendra
2020-02-24 4:00 ` [PATCH V4 RESEND 3/7] xfs: xfs_attr_calc_size: Calculate Bmbt blks only once Chandan Rajendra
2020-02-25 16:11 ` Brian Foster
2020-02-26 15:03 ` Chandan Rajendra
2020-02-26 16:42 ` Brian Foster
2020-02-27 8:59 ` Chandan Rajendra
2020-02-27 11:53 ` Brian Foster
2020-02-27 13:38 ` Chandan Rajendra
2020-02-24 4:00 ` [PATCH V4 RESEND 4/7] xfs: Introduce struct xfs_attr_set_resv Chandan Rajendra
2020-02-25 16:27 ` Brian Foster
2020-02-26 10:40 ` Chandan Rajendra
2020-02-24 4:00 ` [PATCH V4 RESEND 5/7] xfs: xfs_attr_calc_size: Explicitly pass mp, namelen and valuelen args Chandan Rajendra
2020-02-25 16:27 ` Brian Foster [this message]
2020-02-24 4:00 ` [PATCH V4 RESEND 6/7] xfs: Make xfs_attr_calc_size() non-static Chandan Rajendra
2020-02-25 16:24 ` Darrick J. Wong
2020-02-24 4:00 ` [PATCH V4 RESEND 7/7] xfs: Fix log reservation calculation for xattr insert operation Chandan Rajendra
2020-02-25 17:19 ` Brian Foster
2020-02-26 11:21 ` Chandan Rajendra
2020-02-26 18:50 ` Brian Foster
2020-02-27 9:14 ` 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=20200225162749.GE54181@bfoster \
--to=bfoster@redhat.com \
--cc=amir73il@gmail.com \
--cc=chandan@linux.ibm.com \
--cc=chandanrlinux@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox