Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: automatically enable GENHD_FL_EXT_DEVT

Browse Source 
Automatically set the GENHD_FL_EXT_DEVT flag for all disks allocated
without an explicit number of minors.  This is what all new block
drivers should do, so make sure it is the default without boilerplate
code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20210521055116.1053587-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-05-21 07:50:53 +02:00 committed by Jens Axboe
parent 2e3c73fa0c
commit 0d1feb72ff
10 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/genhd.c
View File

@ -497,7 +497,6 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
} }
} else { } else {
WARN_ON(disk->minors); WARN_ON(disk->minors);
WARN_ON(!(disk->flags & (GENHD_FL_EXT_DEVT | GENHD_FL_HIDDEN)));
ret = blk_alloc_ext_minor(); ret = blk_alloc_ext_minor();
if (ret < 0) { if (ret < 0) {
@ -506,6 +505,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
} }
disk->major = BLOCK_EXT_MAJOR; disk->major = BLOCK_EXT_MAJOR;
disk->first_minor = MINOR(ret); disk->first_minor = MINOR(ret);
disk->flags |= GENHD_FL_EXT_DEVT;
} }
disk->flags |= GENHD_FL_UP; disk->flags |= GENHD_FL_UP;

4
block/partitions/core.c
View File

@ -326,10 +326,6 @@ static struct block_device *add_partition(struct gendisk *disk, int partno,
const char *dname; const char *dname;
int err; int err;
/*
* disk_max_parts() won't be zero, either GENHD_FL_EXT_DEVT is set
* or 'minors' is passed to alloc_disk().
*/
if (partno >= disk_max_parts(disk)) if (partno >= disk_max_parts(disk))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);

2
drivers/block/n64cart.c
View File

@ -141,7 +141,7 @@ static int __init n64cart_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
disk->first_minor = 0; disk->first_minor = 0;
disk->flags = GENHD_FL_NO_PART_SCAN | GENHD_FL_EXT_DEVT; disk->flags = GENHD_FL_NO_PART_SCAN;
disk->fops = &n64cart_fops; disk->fops = &n64cart_fops;
disk->private_data = &pdev->dev; disk->private_data = &pdev->dev;
strcpy(disk->disk_name, "n64cart"); strcpy(disk->disk_name, "n64cart");

1
drivers/lightnvm/core.c
View File

@ -383,7 +383,6 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
} }
strlcpy(tdisk->disk_name, create->tgtname, sizeof(tdisk->disk_name)); strlcpy(tdisk->disk_name, create->tgtname, sizeof(tdisk->disk_name));
tdisk->flags = GENHD_FL_EXT_DEVT;
tdisk->major = 0; tdisk->major = 0;
tdisk->first_minor = 0; tdisk->first_minor = 0;
tdisk->fops = tt->bops; tdisk->fops = tt->bops;

1
drivers/memstick/core/ms_block.c
View File

@ -2136,7 +2136,6 @@ static int msb_init_disk(struct memstick_dev *card)
msb->disk->fops = &msb_bdops; msb->disk->fops = &msb_bdops;
msb->disk->private_data = msb; msb->disk->private_data = msb;
msb->disk->queue = msb->queue; msb->disk->queue = msb->queue;
msb->disk->flags |= GENHD_FL_EXT_DEVT;
capacity = msb->pages_in_block * msb->logical_block_count; capacity = msb->pages_in_block * msb->logical_block_count;
capacity *= (msb->page_size / 512); capacity *= (msb->page_size / 512);

1
drivers/nvdimm/blk.c
View File

@ -267,7 +267,6 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk)
disk->first_minor = 0; disk->first_minor = 0;
disk->fops = &nd_blk_fops; disk->fops = &nd_blk_fops;
disk->queue = q; disk->queue = q;
disk->flags = GENHD_FL_EXT_DEVT;
disk->private_data = nsblk; disk->private_data = nsblk;
nvdimm_namespace_disk_name(&nsblk->common, disk->disk_name); nvdimm_namespace_disk_name(&nsblk->common, disk->disk_name);

1
drivers/nvdimm/btt.c
View File

@ -1537,7 +1537,6 @@ static int btt_blk_init(struct btt *btt)
btt->btt_disk->fops = &btt_fops; btt->btt_disk->fops = &btt_fops;
btt->btt_disk->private_data = btt; btt->btt_disk->private_data = btt;
btt->btt_disk->queue = btt->btt_queue; btt->btt_disk->queue = btt->btt_queue;
btt->btt_disk->flags = GENHD_FL_EXT_DEVT;
blk_queue_logical_block_size(btt->btt_queue, btt->sector_size); blk_queue_logical_block_size(btt->btt_queue, btt->sector_size);
blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX); blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX);

1
drivers/nvdimm/pmem.c
View File

@ -477,7 +477,6 @@ static int pmem_attach_disk(struct device *dev,
disk->fops = &pmem_fops; disk->fops = &pmem_fops;
disk->queue = q; disk->queue = q;
disk->flags = GENHD_FL_EXT_DEVT;
disk->private_data = pmem; disk->private_data = pmem;
nvdimm_namespace_disk_name(ndns, disk->disk_name); nvdimm_namespace_disk_name(ndns, disk->disk_name);
set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset) set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)

1
drivers/nvme/host/core.c
View File

@ -3699,7 +3699,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,
disk->fops = &nvme_bdev_ops; disk->fops = &nvme_bdev_ops;
disk->private_data = ns; disk->private_data = ns;
disk->queue = ns->queue; disk->queue = ns->queue;
disk->flags = GENHD_FL_EXT_DEVT;
/* /*
* Without the multipath code enabled, multiple controller per * Without the multipath code enabled, multiple controller per
* subsystems are visible as devices and thus we cannot use the * subsystems are visible as devices and thus we cannot use the

1
drivers/nvme/host/multipath.c
View File

@ -462,7 +462,6 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)
head->disk->fops = &nvme_ns_head_ops; head->disk->fops = &nvme_ns_head_ops;
head->disk->private_data = head; head->disk->private_data = head;
head->disk->queue = q; head->disk->queue = q;
head->disk->flags = GENHD_FL_EXT_DEVT;
sprintf(head->disk->disk_name, "nvme%dn%d", sprintf(head->disk->disk_name, "nvme%dn%d",
ctrl->subsys->instance, head->instance); ctrl->subsys->instance, head->instance);
return 0; return 0;