leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: remove the minors argument to __alloc_disk_node

Browse Source 
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>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>	[dasd]
Link: https://lore.kernel.org/r/20210816131910.615153-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-08-16 15:19:07 +02:00 committed by Jens Axboe
parent 9c2b9dbafc
commit a58bd7683f
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-mq.c
View File

@ -3143,7 +3143,7 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata,
if (IS_ERR(q)) if (IS_ERR(q))
return ERR_CAST(q); return ERR_CAST(q);
disk = __alloc_disk_node(0, set->numa_node, lkclass); disk = __alloc_disk_node(set->numa_node, lkclass);
if (!disk) { if (!disk) {
blk_cleanup_queue(q); blk_cleanup_queue(q);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);

6
block/genhd.c
View File

@ -1254,8 +1254,7 @@ dev_t blk_lookup_devt(const char *name, int partno)
return devt; return devt;
} }
struct gendisk *__alloc_disk_node(int minors, int node_id, struct gendisk *__alloc_disk_node(int node_id, struct lock_class_key *lkclass)
struct lock_class_key *lkclass)
{ {
struct gendisk *disk; struct gendisk *disk;
@ -1277,7 +1276,6 @@ struct gendisk *__alloc_disk_node(int minors, int node_id,
if (xa_insert(&disk->part_tbl, 0, disk->part0, GFP_KERNEL)) if (xa_insert(&disk->part_tbl, 0, disk->part0, GFP_KERNEL))
goto out_destroy_part_tbl; goto out_destroy_part_tbl;
disk->minors = minors;
rand_initialize_disk(disk); rand_initialize_disk(disk);
disk_to_dev(disk)->class = &block_class; disk_to_dev(disk)->class = &block_class;
disk_to_dev(disk)->type = &disk_type; disk_to_dev(disk)->type = &disk_type;
@ -1309,7 +1307,7 @@ struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass)
if (!q) if (!q)
return NULL; return NULL;
disk = __alloc_disk_node(0, node, lkclass); disk = __alloc_disk_node(node, lkclass);
if (!disk) { if (!disk) {
blk_cleanup_queue(q); blk_cleanup_queue(q);
return NULL; return NULL;

4
drivers/s390/block/dasd_genhd.c
View File

@ -40,14 +40,14 @@ int dasd_gendisk_alloc(struct dasd_block *block)
if (base->devindex >= DASD_PER_MAJOR) if (base->devindex >= DASD_PER_MAJOR)
return -EBUSY; return -EBUSY;
gdp = __alloc_disk_node(1 << DASD_PARTN_BITS, NUMA_NO_NODE, gdp = __alloc_disk_node(NUMA_NO_NODE, &dasd_bio_compl_lkclass);
&dasd_bio_compl_lkclass);
if (!gdp) if (!gdp)
return -ENOMEM; return -ENOMEM;
/* Initialize gendisk structure. */ /* Initialize gendisk structure. */
gdp->major = DASD_MAJOR; gdp->major = DASD_MAJOR;
gdp->first_minor = base->devindex << DASD_PARTN_BITS; gdp->first_minor = base->devindex << DASD_PARTN_BITS;
gdp->minors = 1 << DASD_PARTN_BITS;
gdp->fops = &dasd_device_operations; gdp->fops = &dasd_device_operations;
/* /*

3
drivers/scsi/sd.c
View File

@ -3409,7 +3409,7 @@ static int sd_probe(struct device *dev)
if (!sdkp) if (!sdkp)
goto out; 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) if (!gd)
goto out_free; goto out_free;
@ -3455,6 +3455,7 @@ static int sd_probe(struct device *dev)
gd->major = sd_major((index & 0xf0) >> 4); gd->major = sd_major((index & 0xf0) >> 4);
gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00); gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
gd->minors = SD_MINORS;
gd->fops = &sd_fops; gd->fops = &sd_fops;
gd->private_data = &sdkp->driver; gd->private_data = &sdkp->driver;

3
drivers/scsi/sr.c
View File

@ -714,7 +714,7 @@ static int sr_probe(struct device *dev)
kref_init(&cd->kref); 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) if (!disk)
goto fail_free; goto fail_free;
mutex_init(&cd->lock); mutex_init(&cd->lock);
@ -731,6 +731,7 @@ static int sr_probe(struct device *dev)
disk->major = SCSI_CDROM_MAJOR; disk->major = SCSI_CDROM_MAJOR;
disk->first_minor = minor; disk->first_minor = minor;
disk->minors = 1;
sprintf(disk->disk_name, "sr%d", minor); sprintf(disk->disk_name, "sr%d", minor);
disk->fops = &sr_bdops; disk->fops = &sr_bdops;
disk->flags = GENHD_FL_CD | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; disk->flags = GENHD_FL_CD | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;

3
include/linux/genhd.h
View File

@ -259,8 +259,7 @@ static inline sector_t get_capacity(struct gendisk *disk)
int bdev_disk_changed(struct gendisk *disk, bool invalidate); int bdev_disk_changed(struct gendisk *disk, bool invalidate);
void blk_drop_partitions(struct gendisk *disk); void blk_drop_partitions(struct gendisk *disk);
struct gendisk *__alloc_disk_node(int minors, int node_id, struct gendisk *__alloc_disk_node(int node_id, struct lock_class_key *lkclass);
struct lock_class_key *lkclass);
extern void put_disk(struct gendisk *disk); extern void put_disk(struct gendisk *disk);
struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass); struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass);