From: Chandan Babu R <chandan.babu@oracle.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v27 13/15] xfs: Add helper function xfs_init_attr_trans
Date: Wed, 16 Feb 2022 20:18:00 +0530 [thread overview]
Message-ID: <87fsoij2an.fsf@debian-BULLSEYE-live-builder-AMD64> (raw)
In-Reply-To: <20220216013713.1191082-14-allison.henderson@oracle.com>
On 16 Feb 2022 at 07:07, Allison Henderson wrote:
> Quick helper function to collapse duplicate code to initialize
> transactions for attributes
Looks good to me.
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> Suggested-by: Darrick J. Wong <djwong@kernel.org>
> ---
> fs/xfs/libxfs/xfs_attr.c | 32 ++++++++++++++++++++++----------
> fs/xfs/libxfs/xfs_attr.h | 2 ++
> fs/xfs/xfs_attr_item.c | 12 ++----------
> 3 files changed, 26 insertions(+), 20 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 7d6ad1d0e10b..d51aea332ca1 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -202,6 +202,27 @@ xfs_attr_calc_size(
> return nblks;
> }
>
> +/* Initialize transaction reservation for attr operations */
> +void xfs_init_attr_trans(
> + struct xfs_da_args *args,
> + struct xfs_trans_res *tres,
> + unsigned int *total)
> +{
> + struct xfs_mount *mp = args->dp->i_mount;
> +
> + if (args->value) {
> + tres->tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
> + M_RES(mp)->tr_attrsetrt.tr_logres *
> + args->total;
> + tres->tr_logcount = XFS_ATTRSET_LOG_COUNT;
> + tres->tr_logflags = XFS_TRANS_PERM_LOG_RES;
> + *total = args->total;
> + } else {
> + *tres = M_RES(mp)->tr_attrrm;
> + *total = XFS_ATTRRM_SPACE_RES(mp);
> + }
> +}
> +
> STATIC int
> xfs_attr_try_sf_addname(
> struct xfs_inode *dp,
> @@ -701,20 +722,10 @@ xfs_attr_set(
> return error;
> }
>
> - tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
> - M_RES(mp)->tr_attrsetrt.tr_logres *
> - args->total;
> - tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
> - tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
> - total = args->total;
> -
> if (!local)
> rmt_blks = xfs_attr3_rmt_blocks(mp, args->valuelen);
> } else {
> XFS_STATS_INC(mp, xs_attr_remove);
> -
> - tres = M_RES(mp)->tr_attrrm;
> - total = XFS_ATTRRM_SPACE_RES(mp);
> rmt_blks = xfs_attr3_rmt_blocks(mp, XFS_XATTR_SIZE_MAX);
> }
>
> @@ -728,6 +739,7 @@ xfs_attr_set(
> * Root fork attributes can use reserved data blocks for this
> * operation if necessary
> */
> + xfs_init_attr_trans(args, &tres, &total);
> error = xfs_trans_alloc_inode(dp, &tres, total, 0, rsvd, &args->trans);
> if (error)
> goto drop_incompat;
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 1ef58d34eb59..f6c13d2bfbcd 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -519,6 +519,8 @@ int xfs_attr_set_iter(struct xfs_attr_item *attr);
> int xfs_attr_remove_iter(struct xfs_attr_item *attr);
> bool xfs_attr_namecheck(const void *name, size_t length);
> int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
> +void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres,
> + unsigned int *total);
> int xfs_attr_set_deferred(struct xfs_da_args *args);
> int xfs_attr_remove_deferred(struct xfs_da_args *args);
>
> diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
> index 878f50babb23..5aa7a764d95e 100644
> --- a/fs/xfs/xfs_attr_item.c
> +++ b/fs/xfs/xfs_attr_item.c
> @@ -532,17 +532,9 @@ xfs_attri_item_recover(
> args->value = attrip->attri_value;
> args->valuelen = attrp->alfi_value_len;
> args->total = xfs_attr_calc_size(args, &local);
> -
> - tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
> - M_RES(mp)->tr_attrsetrt.tr_logres *
> - args->total;
> - tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
> - tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
> - total = args->total;
> - } else {
> - tres = M_RES(mp)->tr_attrrm;
> - total = XFS_ATTRRM_SPACE_RES(mp);
> }
> +
> + xfs_init_attr_trans(args, &tres, &total);
> error = xfs_trans_alloc(mp, &tres, total, 0, XFS_TRANS_RESERVE, &tp);
> if (error)
> goto out;
--
chandan
next prev parent reply other threads:[~2022-02-16 14:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 1:36 [PATCH v27 00/15] xfs: Log Attribute Replay Allison Henderson
2022-02-16 1:36 ` [PATCH v27 01/15] xfs: Fix double unlock in defer capture code Allison Henderson
2022-02-16 14:47 ` Chandan Babu R
2022-02-16 1:37 ` [PATCH v27 02/15] xfs: don't commit the first deferred transaction without intents Allison Henderson
2022-02-16 2:27 ` Darrick J. Wong
2022-02-16 14:47 ` Chandan Babu R
2022-02-16 1:37 ` [PATCH v27 03/15] xfs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
2022-02-16 1:37 ` [PATCH v27 04/15] xfs: Set up infrastructure for log attribute replay Allison Henderson
2022-02-16 1:37 ` [PATCH v27 05/15] xfs: Implement attr logging and replay Allison Henderson
2022-02-16 1:37 ` [PATCH v27 06/15] xfs: Skip flip flags for delayed attrs Allison Henderson
2022-02-16 1:37 ` [PATCH v27 07/15] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2022-02-16 1:37 ` [PATCH v27 08/15] xfs: Remove unused xfs_attr_*_args Allison Henderson
2022-02-16 1:37 ` [PATCH v27 09/15] xfs: Add log attribute error tag Allison Henderson
2022-02-16 1:37 ` [PATCH v27 10/15] xfs: Add larp debug option Allison Henderson
2022-02-16 1:37 ` [PATCH v27 11/15] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2022-02-16 1:37 ` [PATCH v27 12/15] xfs: Add helper function xfs_attr_leaf_addname Allison Henderson
2022-02-16 1:37 ` [PATCH v27 13/15] xfs: Add helper function xfs_init_attr_trans Allison Henderson
2022-02-16 2:30 ` Darrick J. Wong
2022-02-16 14:48 ` Chandan Babu R [this message]
2022-02-16 1:37 ` [PATCH v27 14/15] xfs: add leaf split error tag Allison Henderson
2022-02-16 14:59 ` Chandan Babu R
2022-02-16 1:37 ` [PATCH v27 15/15] xfs: add leaf to node " Allison Henderson
2022-02-16 15:00 ` 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=87fsoij2an.fsf@debian-BULLSEYE-live-builder-AMD64 \
--to=chandan.babu@oracle.com \
--cc=allison.henderson@oracle.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