| Message ID | 20210521055116.1053587-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/26] block: refactor device number setup in __device_add_disk | expand |
On Fri, May 21, 2021 at 07:50:52AM +0200, Christoph Hellwig wrote: > Keep this together with the first place that actually looks at > ->minors and prepare for not passing a minors argument to > alloc_disk. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Luis
On 5/21/21 7:50 AM, Christoph Hellwig wrote: > Keep this together with the first place that actually looks at > ->minors and prepare for not passing a minors argument to > alloc_disk. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/genhd.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/block/genhd.c b/block/genhd.c index 2c00bc3261d9..7f9beaeede11 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -491,6 +491,12 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, */ if (disk->major) { WARN_ON(!disk->minors); + + if (disk->minors > DISK_MAX_PARTS) { + pr_err("block: can't allocate more than %d partitions\n", + DISK_MAX_PARTS); + disk->minors = DISK_MAX_PARTS; + } } else { WARN_ON(disk->minors); WARN_ON(!(disk->flags & (GENHD_FL_EXT_DEVT | GENHD_FL_HIDDEN))); @@ -1264,13 +1270,6 @@ struct gendisk *__alloc_disk_node(int minors, int node_id) { struct gendisk *disk; - if (minors > DISK_MAX_PARTS) { - printk(KERN_ERR - "block: can't allocate more than %d partitions\n", - DISK_MAX_PARTS); - minors = DISK_MAX_PARTS; - } - disk = kzalloc_node(sizeof(struct gendisk), GFP_KERNEL, node_id); if (!disk) return NULL;
Keep this together with the first place that actually looks at ->minors and prepare for not passing a minors argument to alloc_disk. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/genhd.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)