block: remove the minors argument to __alloc_disk_node

This was a leftover from the legacy alloc_disk interface.  Switch
the scsi ULPs and dasd to set ->minors directly like all other
drivers and remove the argument.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index f7e9e8d84d4a3259e6907d756e35908090c5c686..b9021d801f280fef13dd63aeb7caccbed1dd5d90 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3143,7 +3143,7 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata,
        if (IS_ERR(q))
                return ERR_CAST(q);
 
-       disk = __alloc_disk_node(0, set->numa_node, lkclass);
+       disk = __alloc_disk_node(set->numa_node, lkclass);
        if (!disk) {
                blk_cleanup_queue(q);
                return ERR_PTR(-ENOMEM);

diff --git a/block/genhd.c b/block/genhd.c
index 3e2bc52013ca2b339a87ef58ab5c8c419ef1f687..3950135451370103b7a1a4fa624f894805550867 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1263,8 +1263,7 @@ dev_t blk_lookup_devt(const char *name, int partno)
        return devt;
 }
 
-struct gendisk *__alloc_disk_node(int minors, int node_id,
-               struct lock_class_key *lkclass)
+struct gendisk *__alloc_disk_node(int node_id, struct lock_class_key *lkclass)
 {
        struct gendisk *disk;
 
@@ -1282,7 +1281,6 @@ struct gendisk *__alloc_disk_node(int minors, int node_id,
        if (xa_insert(&disk->part_tbl, 0, disk->part0, GFP_KERNEL))
                goto out_destroy_part_tbl;
 
-       disk->minors = minors;
        rand_initialize_disk(disk);
        disk_to_dev(disk)->class = &block_class;
        disk_to_dev(disk)->type = &disk_type;
@@ -1310,7 +1308,7 @@ struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass)
        if (!q)
                return NULL;
 
-       disk = __alloc_disk_node(0, node, lkclass);
+       disk = __alloc_disk_node(node, lkclass);
        if (!disk) {
                blk_cleanup_queue(q);
                return NULL;

diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 07a69b19dd3187681340e82d33846a9df17abc31..6e44515b4d330af7a952789bc690f7e6b007f16c 100644 (file)
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -40,14 +40,14 @@ int dasd_gendisk_alloc(struct dasd_block *block)
        if (base->devindex >= DASD_PER_MAJOR)
                return -EBUSY;
 
-       gdp = __alloc_disk_node(1 << DASD_PARTN_BITS, NUMA_NO_NODE,
-                               &dasd_bio_compl_lkclass);
+       gdp = __alloc_disk_node(NUMA_NO_NODE, &dasd_bio_compl_lkclass);
        if (!gdp)
                return -ENOMEM;
 
        /* Initialize gendisk structure. */
        gdp->major = DASD_MAJOR;
        gdp->first_minor = base->devindex << DASD_PARTN_BITS;
+       gdp->minors = 1 << DASD_PARTN_BITS;
        gdp->fops = &dasd_device_operations;
 
        /*

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 4986086009f1c5f1c9ddd7838c2943f6240a7b8a..4e22d1bb62266c1baa029497ce342fe5c73a950b 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3409,7 +3409,7 @@ static int sd_probe(struct device *dev)
        if (!sdkp)
                goto out;
 
-       gd = __alloc_disk_node(SD_MINORS, NUMA_NO_NODE, &sd_bio_compl_lkclass);
+       gd = __alloc_disk_node(NUMA_NO_NODE, &sd_bio_compl_lkclass);
        if (!gd)
                goto out_free;
 
@@ -3455,6 +3455,7 @@ static int sd_probe(struct device *dev)
 
        gd->major = sd_major((index & 0xf0) >> 4);
        gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
+       gd->minors = SD_MINORS;
 
        gd->fops = &sd_fops;
        gd->private_data = &sdkp->driver;

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index fee2bdfe6132f220df9c5acee9b222e50e9aa6f3..2c45b4140e67d2a0723a08e2f90e174002cf4c1b 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -714,7 +714,7 @@ static int sr_probe(struct device *dev)
 
        kref_init(&cd->kref);
 
-       disk = __alloc_disk_node(1, NUMA_NO_NODE, &sr_bio_compl_lkclass);
+       disk = __alloc_disk_node(NUMA_NO_NODE, &sr_bio_compl_lkclass);
        if (!disk)
                goto fail_free;
        mutex_init(&cd->lock);
@@ -731,6 +731,7 @@ static int sr_probe(struct device *dev)
 
        disk->major = SCSI_CDROM_MAJOR;
        disk->first_minor = minor;
+       disk->minors = 1;
        sprintf(disk->disk_name, "sr%d", minor);
        disk->fops = &sr_bdops;
        disk->flags = GENHD_FL_CD | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index bd8565e8f7c7ded9531fc4041686897190da3dad..02c0977993f2d4cd2e04476e4f48712417ea71ca 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -262,8 +262,7 @@ static inline sector_t get_capacity(struct gendisk *disk)
 int bdev_disk_changed(struct gendisk *disk, bool invalidate);
 void blk_drop_partitions(struct gendisk *disk);
 
-struct gendisk *__alloc_disk_node(int minors, int node_id,
-               struct lock_class_key *lkclass);
+struct gendisk *__alloc_disk_node(int node_id, struct lock_class_key *lkclass);
 extern void put_disk(struct gendisk *disk);
 struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass);