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 05/72] badblocks: Add badblocks merge logic
Date:   Fri, 18 Nov 2022 07:31:17 -0600
Message-Id: <A77B6257-E497-46B5-81BC-EDF5FF6C411B@dilger.ca>
References: <01e72f626dcebdb8f0a78b53e4cd093357d82787.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: <01e72f626dcebdb8f0a78b53e4cd093357d82787.1667822611.git.ritesh.list@gmail.com>
To:     "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Precedence: bulk

On Nov 7, 2022, at 06:22, Ritesh Harjani (IBM) <ritesh.list@gmail.com> wrote=
:
>=20
> =EF=BB=BFFrom: Wang Shilong <wshilong@ddn.com>
>=20
> Add badblocks merge logic
>=20
> Signed-off-by: Wang Shilong <wshilong@ddn.com>
> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>

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

> ---
> lib/ext2fs/badblocks.c | 75 ++++++++++++++++++++++++++++++++++++++++++
> lib/ext2fs/ext2fs.h    |  2 ++
> 2 files changed, 77 insertions(+)
>=20
> diff --git a/lib/ext2fs/badblocks.c b/lib/ext2fs/badblocks.c
> index 345168e0..36794e69 100644
> --- a/lib/ext2fs/badblocks.c
> +++ b/lib/ext2fs/badblocks.c
> @@ -56,6 +56,74 @@ static errcode_t make_u32_list(int size, int num, __u32=
 *list,
>    return 0;
> }
>=20
> +static inline int insert_ok(blk_t *array, int cnt, blk_t new)
> +{
> +   return (cnt =3D=3D 0 || array[cnt - 1] !=3D new);
> +}
> +
> +/*
> + * Merge list from src to dest
> + */
> +static errcode_t merge_u32_list(ext2_u32_list src, ext2_u32_list dest)
> +{
> +   errcode_t    retval;
> +   int      src_count =3D src->num;
> +   int      dest_count =3D dest->num;
> +   int      size =3D src_count + dest_count;
> +   int      size_entry =3D sizeof(blk_t);
> +   blk_t       *array;
> +   blk_t       *src_array =3D src->list;
> +   blk_t       *dest_array =3D dest->list;
> +   int      src_index =3D 0;
> +   int      dest_index =3D 0;
> +   int      uniq_cnt =3D 0;
> +
> +   if (src->num =3D=3D 0)
> +       return 0;
> +
> +   retval =3D ext2fs_get_array(size, size_entry, &array);
> +   if (retval)
> +       return retval;
> +
> +   /*
> +    * It is possible that src list and dest list could be
> +    * duplicated when merging badblocks.
> +    */
> +   while (src_index < src_count || dest_index < dest_count) {
> +       if (src_index >=3D src_count) {
> +           for (; dest_index < dest_count; dest_index++)
> +               if (insert_ok(array, uniq_cnt, dest_array[dest_index]))
> +                   array[uniq_cnt++] =3D dest_array[dest_index];
> +           break;
> +       }
> +       if (dest_index >=3D dest_count) {
> +           for (; src_index < src_count; src_index++)
> +               if (insert_ok(array, uniq_cnt, src_array[src_index]))
> +                   array[uniq_cnt++] =3D src_array[src_index];
> +           break;
> +       }
> +       if (src_array[src_index] < dest_array[dest_index]) {
> +           if (insert_ok(array, uniq_cnt, src_array[src_index]))
> +               array[uniq_cnt++] =3D src_array[src_index];
> +           src_index++;
> +       } else if (src_array[src_index] > dest_array[dest_index]) {
> +           if (insert_ok(array, uniq_cnt, dest_array[dest_index]))
> +               array[uniq_cnt++] =3D dest_array[dest_index];
> +           dest_index++;
> +       } else {
> +           if (insert_ok(array, uniq_cnt, dest_array[dest_index]))
> +               array[uniq_cnt++] =3D dest_array[dest_index];
> +           src_index++;
> +           dest_index++;
> +       }
> +   }
> +
> +   ext2fs_free_mem(&dest->list);
> +   dest->list =3D array;
> +   dest->num =3D uniq_cnt;
> +   dest->size =3D size;
> +   return 0;
> +}
>=20
> /*
>  * This procedure creates an empty u32 list.
> @@ -91,6 +159,13 @@ errcode_t ext2fs_badblocks_copy(ext2_badblocks_list sr=
c,
>                   (ext2_u32_list *) dest);
> }
>=20
> +errcode_t ext2fs_badblocks_merge(ext2_badblocks_list src,
> +                ext2_badblocks_list dest)
> +{
> +   return merge_u32_list((ext2_u32_list) src,
> +                 (ext2_u32_list) dest);
> +}
> +
> /*
>  * This procedure frees a badblocks list.
>  *
> diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
> index 9cc994b1..18dddc2c 100644
> --- a/lib/ext2fs/ext2fs.h
> +++ b/lib/ext2fs/ext2fs.h
> @@ -845,6 +845,8 @@ extern int ext2fs_badblocks_list_iterate(ext2_badblock=
s_iterate iter,
> extern void ext2fs_badblocks_list_iterate_end(ext2_badblocks_iterate iter)=
;
> extern errcode_t ext2fs_badblocks_copy(ext2_badblocks_list src,
>                       ext2_badblocks_list *dest);
> +extern errcode_t ext2fs_badblocks_merge(ext2_badblocks_list src,
> +                   ext2_badblocks_list dest);
> extern int ext2fs_badblocks_equal(ext2_badblocks_list bb1,
>                  ext2_badblocks_list bb2);
> extern int ext2fs_u32_list_count(ext2_u32_list bb);
> --=20
> 2.37.3
>=20