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 4/7] xfs: Introduce struct xfs_attr_set_resv
Date: Tue, 25 Feb 2020 11:27:40 -0500 [thread overview]
Message-ID: <20200225162740.GD54181@bfoster> (raw)
In-Reply-To: <20200224040044.30923-5-chandanrlinux@gmail.com>
On Mon, Feb 24, 2020 at 09:30:41AM +0530, Chandan Rajendra wrote:
> The intermediate numbers calculated by xfs_attr_calc_size() will be needed by
> a future commit to correctly calculate log reservation for xattr set
> operation. Towards this goal, this commit introduces 'struct
> xfs_attr_set_resv' to collect,
> 1. Number of dabtree blocks.
> 2. Number of remote blocks.
> 3. Number of Bmbt blocks.
> 4. Total number of blocks we need to reserve.
>
> This will be returned as an out argument by xfs_attr_calc_size().
>
> Signed-off-by: Chandan Rajendra <chandanrlinux@gmail.com>
> ---
> fs/xfs/libxfs/xfs_attr.c | 50 ++++++++++++++++++++++------------------
> fs/xfs/libxfs/xfs_attr.h | 13 +++++++++++
> 2 files changed, 40 insertions(+), 23 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index a708b142f69b6..921acac71e5d9 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -136,16 +136,14 @@ xfs_attr_get(
> /*
> * Calculate how many blocks we need for the new attribute,
> */
> -STATIC int
> +STATIC void
> xfs_attr_calc_size(
> - struct xfs_da_args *args,
> - int *local)
> + struct xfs_da_args *args,
> + struct xfs_attr_set_resv *resv,
> + int *local)
> {
> - struct xfs_mount *mp = args->dp->i_mount;
> - unsigned int total_dablks;
> - unsigned int bmbt_blks;
> - unsigned int rmt_blks;
> - int size;
> + struct xfs_mount *mp = args->dp->i_mount;
> + int size;
>
> /*
> * Determine space new attribute will use, and if it would be
> @@ -153,25 +151,27 @@ xfs_attr_calc_size(
> */
> size = xfs_attr_leaf_newentsize(args->geo, args->namelen,
> args->valuelen, local);
> - total_dablks = XFS_DAENTER_BLOCKS(mp, XFS_ATTR_FORK);
> + resv->total_dablks = XFS_DAENTER_BLOCKS(mp, XFS_ATTR_FORK);
> if (*local) {
> if (size > (args->geo->blksize / 2)) {
> /* Double split possible */
> - total_dablks *= 2;
> + resv->total_dablks *= 2;
> }
> - rmt_blks = 0;
> + resv->rmt_blks = 0;
> } else {
> /*
> * Out of line attribute, cannot double split, but
> * make room for the attribute value itself.
> */
> - rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen);
> + resv->rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen);
> }
>
> - bmbt_blks = XFS_NEXTENTADD_SPACE_RES(mp, total_dablks + rmt_blks,
> - XFS_ATTR_FORK);
> + resv->bmbt_blks = XFS_NEXTENTADD_SPACE_RES(mp,
> + resv->total_dablks + resv->rmt_blks,
> + XFS_ATTR_FORK);
>
> - return total_dablks + rmt_blks + bmbt_blks;
> + resv->alloc_blks = resv->total_dablks + resv->rmt_blks +
> + resv->bmbt_blks;
Do we really need a field to track the total of three other fields in
the same structure? I'd rather just let the caller add them up for
args.total if that's the only usage.
Brian
> }
>
> STATIC int
> @@ -295,14 +295,17 @@ xfs_attr_remove_args(
> */
> int
> xfs_attr_set(
> - struct xfs_da_args *args)
> + struct xfs_da_args *args)
> {
> - struct xfs_inode *dp = args->dp;
> - struct xfs_mount *mp = dp->i_mount;
> - struct xfs_trans_res tres;
> - bool rsvd = (args->attr_namespace & XFS_ATTR_ROOT);
> - int error, local;
> - unsigned int total;
> + struct xfs_inode *dp = args->dp;
> + struct xfs_mount *mp = dp->i_mount;
> + struct xfs_attr_set_resv resv;
> + struct xfs_trans_res tres;
> + bool rsvd;
> + int error, local;
> + unsigned int total;
> +
> + rsvd = (args->attr_namespace & XFS_ATTR_ROOT);
>
> if (XFS_FORCED_SHUTDOWN(dp->i_mount))
> return -EIO;
> @@ -326,7 +329,8 @@ xfs_attr_set(
> XFS_STATS_INC(mp, xs_attr_set);
>
> args->op_flags |= XFS_DA_OP_ADDNAME;
> - args->total = xfs_attr_calc_size(args, &local);
> + xfs_attr_calc_size(args, &resv, &local);
> + args->total = resv.alloc_blks;
>
> /*
> * If the inode doesn't have an attribute fork, add one.
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 861c81f9bb918..dc08bdfbc9615 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -73,6 +73,19 @@ struct xfs_attr_list_context {
> int index; /* index into output buffer */
> };
>
> +struct xfs_attr_set_resv {
> + /* Number of unlogged blocks needed to store the remote attr value. */
> + unsigned int rmt_blks;
> +
> + /* Number of filesystem blocks to allocate for the da btree. */
> + unsigned int total_dablks;
> +
> + /* Blocks we might need to create all the new attr fork mappings. */
> + unsigned int bmbt_blks;
> +
> + /* Total number of blocks we might have to allocate. */
> + unsigned int alloc_blks;
> +};
>
> /*========================================================================
> * Function prototypes for the kernel.
> --
> 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 [this message]
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
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=20200225162740.GD54181@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 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.