On Sat, May 24, 2025 at 2:18 PM Yu Kuai <yukuai1@xxxxxxxxxxxxxxx> wrote:
>
> From: Yu Kuai <yukuai3@xxxxxxxxxx>
>
> All callers pass in '-1' for 'slot', hence it can be removed.
>
> Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> ---
> drivers/md/md-bitmap.c | 6 +++---
> drivers/md/md-bitmap.h | 2 +-
> drivers/md/md.c | 6 +++---
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
> index 848626049dea..17d41a7b30ce 100644
> --- a/drivers/md/md-bitmap.c
> +++ b/drivers/md/md-bitmap.c
> @@ -2185,9 +2185,9 @@ static struct bitmap *__bitmap_create(struct mddev *mddev, int slot)
> return ERR_PTR(err);
> }
>
> -static int bitmap_create(struct mddev *mddev, int slot)
> +static int bitmap_create(struct mddev *mddev)
> {
> - struct bitmap *bitmap = __bitmap_create(mddev, slot);
> + struct bitmap *bitmap = __bitmap_create(mddev, -1);
>
> if (IS_ERR(bitmap))
> return PTR_ERR(bitmap);
> @@ -2649,7 +2649,7 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
> }
>
> mddev->bitmap_info.offset = offset;
> - rv = bitmap_create(mddev, -1);
> + rv = bitmap_create(mddev);
> if (rv)
> goto out;
>
> diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
> index 4d804c07dbdd..2b99ddef7a41 100644
> --- a/drivers/md/md-bitmap.h
> +++ b/drivers/md/md-bitmap.h
> @@ -77,7 +77,7 @@ struct bitmap_operations {
> struct md_submodule_head head;
>
> bool (*enabled)(void *data);
> - int (*create)(struct mddev *mddev, int slot);
> + int (*create)(struct mddev *mddev);
> int (*resize)(struct mddev *mddev, sector_t blocks, int chunksize);
>
> int (*load)(struct mddev *mddev);
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 466087cef4f9..311e52d5173d 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -6255,7 +6255,7 @@ int md_run(struct mddev *mddev)
> }
> if (err == 0 && pers->sync_request && md_bitmap_registered(mddev) &&
> (mddev->bitmap_info.file || mddev->bitmap_info.offset)) {
> - err = mddev->bitmap_ops->create(mddev, -1);
> + err = mddev->bitmap_ops->create(mddev);
> if (err)
> pr_warn("%s: failed to create bitmap (%d)\n",
> mdname(mddev), err);
> @@ -7324,7 +7324,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
> err = 0;
> if (mddev->pers) {
> if (fd >= 0) {
> - err = mddev->bitmap_ops->create(mddev, -1);
> + err = mddev->bitmap_ops->create(mddev);
> if (!err)
> err = mddev->bitmap_ops->load(mddev);
>
> @@ -7648,7 +7648,7 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
> mddev->bitmap_info.default_offset;
> mddev->bitmap_info.space =
> mddev->bitmap_info.default_space;
> - rv = mddev->bitmap_ops->create(mddev, -1);
> + rv = mddev->bitmap_ops->create(mddev);
> if (!rv)
> rv = mddev->bitmap_ops->load(mddev);
>
> --
> 2.39.2
>
Reviewed-by: Xiao Ni <xni@xxxxxxxxxx>
