Commit 01bf468c authored by Yu Kuai's avatar Yu Kuai
Browse files

md/md-bitmap: remove parameter slot from bitmap_create() 

All callers pass in '-1' for 'slot', hence it can be removed.

Link: https://lore.kernel.org/linux-raid/20250524061320.370630-6-yukuai1@huaweicloud.com


Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarXiao Ni <xni@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent 38f520a3

drivers/md/md-bitmap.c

+3 −3
Original line number Diff line number Diff line
@@ -2214,9 +2214,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);
@@ -2679,7 +2679,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;

drivers/md/md-bitmap.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct md_bitmap_stats { 


struct bitmap_operations {

	bool (*enabled)(struct mddev *mddev);

	int (*create)(struct mddev *mddev, int slot);

	int (*create)(struct mddev *mddev);

	int (*resize)(struct mddev *mddev, sector_t blocks, int chunksize,

		      bool init);

drivers/md/md.c

+3 −3
Original line number Diff line number Diff line
@@ -6225,7 +6225,7 @@ int md_run(struct mddev *mddev) 
	}

	if (err == 0 && pers->sync_request &&

	    (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);
@@ -7285,7 +7285,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);
@@ -7601,7 +7601,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);