]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
md/md-bitmap: remove parameter slot from bitmap_create()
authorYu Kuai <yukuai3@huawei.com>
Sat, 24 May 2025 06:13:02 +0000 (14:13 +0800)
committerYu Kuai <yukuai3@huawei.com>
Fri, 30 May 2025 07:47:23 +0000 (15:47 +0800)
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: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Xiao Ni <xni@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
drivers/md/md-bitmap.c
drivers/md/md-bitmap.h
drivers/md/md.c

index e415219d1f232022943a5020896bcbe3fd3198d6..bd694910b01b0b5ed27712c468d31070afb2284b 100644 (file)
@@ -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;
 
index 96f09d620f33b0784be7b1efa541ec23559daf92..59e9dd45cfdec51be1816722d8b35d1ed2dd1dae 100644 (file)
@@ -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);
 
index d0d9144ced5b9382b613589130a03e9a58e510aa..09042b060086bc71cf72e036f22a6d4dd2e0dde7 100644 (file)
@@ -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);