Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by mail19.linbit.com (LINBIT Mail Daemon) with ESMTP id B4EF5420BA8 for ; Sun, 23 May 2021 10:12:51 +0200 (CEST) To: Christoph Hellwig , Jens Axboe , Geert Uytterhoeven , Chris Zankel , Max Filippov , Philipp Reisner , Lars Ellenberg , Jim Paris , Joshua Morris , Philip Kelleher , Minchan Kim , Nitin Gupta , Matias Bjorling , Coly Li , Mike Snitzer , Song Liu , Maxim Levitsky , Alex Dubov , Ulf Hansson , Dan Williams , Vishal Verma , Dave Jiang , Heiko Carstens , Vasily Gorbik , Christian Borntraeger References: <20210521055116.1053587-1-hch@lst.de> <20210521055116.1053587-15-hch@lst.de> From: Hannes Reinecke Message-ID: Date: Sun, 23 May 2021 10:12:49 +0200 MIME-Version: 1.0 In-Reply-To: <20210521055116.1053587-15-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Cc: linux-bcache@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-raid@vger.kernel.org, nvdimm@lists.linux.dev, linux-s390@vger.kernel.org, linux-mmc@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, dm-devel@redhat.com, linuxppc-dev@lists.ozlabs.org, drbd-dev@lists.linbit.com Subject: Re: [Drbd-dev] [PATCH 14/26] md: convert to blk_alloc_disk/blk_cleanup_disk List-Id: "*Coordination* of development, patches, contributions -- *Questions* \(even to developers\) go to drbd-user, please." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 5/21/21 7:51 AM, Christoph Hellwig wrote: > Convert the md driver to use the blk_alloc_disk and blk_cleanup_disk > helpers to simplify gendisk and request_queue allocation. > > Signed-off-by: Christoph Hellwig > --- > drivers/md/md.c | 25 +++++++++---------------- > 1 file changed, 9 insertions(+), 16 deletions(-) > > diff --git a/drivers/md/md.c b/drivers/md/md.c > index 49f897fbb89b..d806be8cc210 100644 > --- a/drivers/md/md.c > +++ b/drivers/md/md.c > @@ -5598,12 +5598,10 @@ static void md_free(struct kobject *ko) > if (mddev->sysfs_level) > sysfs_put(mddev->sysfs_level); > > - if (mddev->gendisk) > + if (mddev->gendisk) { > del_gendisk(mddev->gendisk); > - if (mddev->queue) > - blk_cleanup_queue(mddev->queue); > - if (mddev->gendisk) > - put_disk(mddev->gendisk); > + blk_cleanup_disk(mddev->gendisk); > + } > percpu_ref_exit(&mddev->writes_pending); > > bioset_exit(&mddev->bio_set); > @@ -5711,20 +5709,13 @@ static int md_alloc(dev_t dev, char *name) > goto abort; > > error = -ENOMEM; > - mddev->queue = blk_alloc_queue(NUMA_NO_NODE); > - if (!mddev->queue) > + disk = blk_alloc_disk(NUMA_NO_NODE); > + if (!disk) > goto abort; > > - blk_set_stacking_limits(&mddev->queue->limits); > - > - disk = alloc_disk(1 << shift); > - if (!disk) { > - blk_cleanup_queue(mddev->queue); > - mddev->queue = NULL; > - goto abort; > - } > disk->major = MAJOR(mddev->unit); > disk->first_minor = unit << shift; > + disk->minors = 1 << shift; > if (name) > strcpy(disk->disk_name, name); > else if (partitioned) > @@ -5733,7 +5724,9 @@ static int md_alloc(dev_t dev, char *name) > sprintf(disk->disk_name, "md%d", unit); > disk->fops = &md_fops; > disk->private_data = mddev; > - disk->queue = mddev->queue; > + > + mddev->queue = disk->queue; > + blk_set_stacking_limits(&mddev->queue->limits); > blk_queue_write_cache(mddev->queue, true, true); > /* Allow extended partitions. This makes the > * 'mdp' device redundant, but we can't really > Wouldn't it make sense to introduce a helper 'blk_queue_from_disk()' or somesuch to avoid having to keep an explicit 'queue' pointer? Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer