Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
From:   Andreas Dilger <adilger@dilger.ca>
Mime-Version: 1.0 (1.0)
Subject: Re: [RFCv1 11/72] libext2fs: merge quota context after threads finish
Date:   Fri, 18 Nov 2022 07:42:04 -0600
Message-Id: <7B432201-71B8-4569-BAD3-805477B4D226@dilger.ca>
References: <a318a46cc1439f32c0fb795d8aa0a435bcfb7e04.1667822611.git.ritesh.list@gmail.com>
Cc:     Theodore Ts'o <tytso@mit.edu>, linux-ext4@vger.kernel.org,
        Harshad Shirwadkar <harshadshirwadkar@gmail.com>,
        Wang Shilong <wshilong@ddn.com>,
        Andreas Dilger <adilger.kernel@dilger.ca>, Li Xi <lixi@ddn.com>
In-Reply-To: <a318a46cc1439f32c0fb795d8aa0a435bcfb7e04.1667822611.git.ritesh.list@gmail.com>
To:     "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Precedence: bulk

On Nov 7, 2022, at 06:23, Ritesh Harjani (IBM) <ritesh.list@gmail.com> wrote=
:
>=20
> =EF=BB=BFFrom: Wang Shilong <wshilong@ddn.com>
>=20
> Every threads calculate its own quota accounting,
> merge them after threads finish.
>=20
> Signed-off-by: Wang Shilong <wshilong@ddn.com>
> [Note: splitted the patch to seperate libext2fs changes from e2fsck]
> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> lib/support/mkquota.c | 39 +++++++++++++++++++++++++++++++++++++++
> lib/support/quotaio.h |  3 +++
> 2 files changed, 42 insertions(+)
>=20
> diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
> index 9339c994..ce1ab4cd 100644
> --- a/lib/support/mkquota.c
> +++ b/lib/support/mkquota.c
> @@ -618,6 +618,45 @@ out:
>    return err;
> }
>=20
> +static errcode_t merge_usage(dict_t *dest, dict_t *src)
> +{
> +    dnode_t *n;
> +    struct dquot *src_dq, *dest_dq;
> +
> +    for (n =3D dict_first(src); n; n =3D dict_next(src, n)) {
> +        src_dq =3D dnode_get(n);
> +        if (!src_dq)
> +            continue;
> +        dest_dq =3D get_dq(dest, src_dq->dq_id);
> +        if (dest_dq =3D=3D NULL)
> +            return -ENOMEM;
> +        dest_dq->dq_dqb.dqb_curspace +=3D src_dq->dq_dqb.dqb_curspace;
> +        dest_dq->dq_dqb.dqb_curinodes +=3D src_dq->dq_dqb.dqb_curinodes;
> +    }
> +
> +    return 0;
> +}
> +
> +
> +errcode_t quota_merge_and_update_usage(quota_ctx_t dest_qctx,
> +                    quota_ctx_t src_qctx)
> +{
> +    dict_t *dict;
> +    enum quota_type    qtype;
> +    errcode_t retval =3D 0;
> +
> +    for (qtype =3D 0; qtype < MAXQUOTAS; qtype++) {
> +        dict =3D src_qctx->quota_dict[qtype];
> +        if (!dict)
> +            continue;
> +        retval =3D merge_usage(dest_qctx->quota_dict[qtype], dict);
> +        if (retval)
> +            break;
> +    }
> +
> +    return retval;
> +}
> +
> /*
>  * Compares the measured quota in qctx->quota_dict with that in the quota i=
node
>  * on disk and updates the limits in qctx->quota_dict. 'usage_inconsistent=
' is
> diff --git a/lib/support/quotaio.h b/lib/support/quotaio.h
> index 84fac35d..240a0762 100644
> --- a/lib/support/quotaio.h
> +++ b/lib/support/quotaio.h
> @@ -40,6 +40,7 @@
> #include "ext2fs/ext2_fs.h"
> #include "ext2fs/ext2fs.h"
> #include "dqblk_v2.h"
> +#include "support/dict.h"
>=20
> typedef int64_t qsize_t;    /* Type in which we store size limitations */
>=20
> @@ -236,6 +237,8 @@ int quota_file_exists(ext2_filsys fs, enum quota_type q=
type);
> void quota_set_sb_inum(ext2_filsys fs, ext2_ino_t ino, enum quota_type qty=
pe);
> errcode_t quota_compare_and_update(quota_ctx_t qctx, enum quota_type qtype=
,
>                   int *usage_inconsistent);
> +errcode_t quota_merge_and_update_usage(quota_ctx_t dest_qctx,
> +                    quota_ctx_t src_qctx);
> int parse_quota_opts(const char *opts, int (*func)(char *));
>=20
> /* parse_qtype.c */
> --=20
> 2.37.3
>=20