Skip to content

Commit 01bf468

Browse files
committed
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/[email protected] Signed-off-by: Yu Kuai <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Xiao Ni <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]>
1 parent 38f520a commit 01bf468

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

drivers/md/md-bitmap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2214,9 +2214,9 @@ static struct bitmap *__bitmap_create(struct mddev *mddev, int slot)
22142214
return ERR_PTR(err);
22152215
}
22162216

2217-
static int bitmap_create(struct mddev *mddev, int slot)
2217+
static int bitmap_create(struct mddev *mddev)
22182218
{
2219-
struct bitmap *bitmap = __bitmap_create(mddev, slot);
2219+
struct bitmap *bitmap = __bitmap_create(mddev, -1);
22202220

22212221
if (IS_ERR(bitmap))
22222222
return PTR_ERR(bitmap);
@@ -2679,7 +2679,7 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
26792679
}
26802680

26812681
mddev->bitmap_info.offset = offset;
2682-
rv = bitmap_create(mddev, -1);
2682+
rv = bitmap_create(mddev);
26832683
if (rv)
26842684
goto out;
26852685

drivers/md/md-bitmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct md_bitmap_stats {
6363

6464
struct bitmap_operations {
6565
bool (*enabled)(struct mddev *mddev);
66-
int (*create)(struct mddev *mddev, int slot);
66+
int (*create)(struct mddev *mddev);
6767
int (*resize)(struct mddev *mddev, sector_t blocks, int chunksize,
6868
bool init);
6969

drivers/md/md.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6225,7 +6225,7 @@ int md_run(struct mddev *mddev)
62256225
}
62266226
if (err == 0 && pers->sync_request &&
62276227
(mddev->bitmap_info.file || mddev->bitmap_info.offset)) {
6228-
err = mddev->bitmap_ops->create(mddev, -1);
6228+
err = mddev->bitmap_ops->create(mddev);
62296229
if (err)
62306230
pr_warn("%s: failed to create bitmap (%d)\n",
62316231
mdname(mddev), err);
@@ -7285,7 +7285,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
72857285
err = 0;
72867286
if (mddev->pers) {
72877287
if (fd >= 0) {
7288-
err = mddev->bitmap_ops->create(mddev, -1);
7288+
err = mddev->bitmap_ops->create(mddev);
72897289
if (!err)
72907290
err = mddev->bitmap_ops->load(mddev);
72917291

@@ -7601,7 +7601,7 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
76017601
mddev->bitmap_info.default_offset;
76027602
mddev->bitmap_info.space =
76037603
mddev->bitmap_info.default_space;
7604-
rv = mddev->bitmap_ops->create(mddev, -1);
7604+
rv = mddev->bitmap_ops->create(mddev);
76057605
if (!rv)
76067606
rv = mddev->bitmap_ops->load(mddev);
76077607

0 commit comments

Comments
 (0)