From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Justin Sanders" <justin@coraid.com>,
"Denis Efremov" <efremov@linux.com>,
"Josef Bacik" <josef@toxicpanda.com>,
"Tim Waugh" <tim@cyberelk.net>,
"Geoff Levand" <geoff@infradead.org>,
"Ilya Dryomov" <idryomov@gmail.com>,
"Md. Haris Iqbal" <haris.iqbal@ionos.com>,
"Jack Wang" <jinpu.wang@ionos.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Mike Snitzer" <snitzer@redhat.com>,
"Maxim Levitsky" <maximlevitsky@gmail.com>,
"Alex Dubov" <oakad@yahoo.com>,
"Miquel Raynal" <miquel.raynal@bootlin.com>,
"Richard Weinberger" <richard@nod.at>,
"Vignesh Raghavendra" <vigneshr@ti.com>,
"Heiko Carstens" <hca@linux.ibm.com>,
"Vasily Gorbik" <gor@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
dm-devel@redhat.com, linux-block@vger.kernel.org,
nbd@other.debian.org, linuxppc-dev@lists.ozlabs.org,
ceph-devel@vger.kernel.org,
virtualization@lists.linux-foundation.org,
xen-devel@lists.xenproject.org, linux-mmc@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-s390@vger.kernel.org
Subject: [PATCH 06/30] pf: use blk_mq_alloc_disk
Date: Wed, 2 Jun 2021 09:53:21 +0300 [thread overview]
Message-ID: <20210602065345.355274-7-hch@lst.de> (raw)
In-Reply-To: <20210602065345.355274-1-hch@lst.de>
Use the blk_mq_alloc_disk API to simplify the gendisk and request_queue
allocation.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/block/paride/pf.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index bb09f21ce21a..d5b9c88ba76f 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -294,20 +294,17 @@ static void __init pf_init_units(void)
for (unit = 0, pf = units; unit < PF_UNITS; unit++, pf++) {
struct gendisk *disk;
- disk = alloc_disk(1);
- if (!disk)
+ if (blk_mq_alloc_sq_tag_set(&pf->tag_set, &pf_mq_ops, 1,
+ BLK_MQ_F_SHOULD_MERGE))
continue;
- disk->queue = blk_mq_init_sq_queue(&pf->tag_set, &pf_mq_ops,
- 1, BLK_MQ_F_SHOULD_MERGE);
- if (IS_ERR(disk->queue)) {
- disk->queue = NULL;
- put_disk(disk);
+ disk = blk_mq_alloc_disk(&pf->tag_set, pf);
+ if (IS_ERR(disk)) {
+ blk_mq_free_tag_set(&pf->tag_set);
continue;
}
INIT_LIST_HEAD(&pf->rq_list);
- disk->queue->queuedata = pf;
blk_queue_max_segments(disk->queue, cluster);
blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
pf->disk = disk;
@@ -318,6 +315,7 @@ static void __init pf_init_units(void)
snprintf(pf->name, PF_NAMELEN, "%s%d", name, unit);
disk->major = major;
disk->first_minor = unit;
+ disk->minors = 1;
strcpy(disk->disk_name, pf->name);
disk->fops = &pf_fops;
disk->events = DISK_EVENT_MEDIA_CHANGE;
@@ -766,10 +764,8 @@ static int pf_detect(void)
for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
if (!pf->disk)
continue;
- blk_cleanup_queue(pf->disk->queue);
- pf->disk->queue = NULL;
+ blk_cleanup_disk(pf->disk);
blk_mq_free_tag_set(&pf->tag_set);
- put_disk(pf->disk);
}
pi_unregister_driver(par_drv);
return -1;
--
2.30.2
next prev parent reply other threads:[~2021-06-02 6:54 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 6:53 simplify gendisk and request_queue allocation for blk-mq based drivers Christoph Hellwig
2021-06-02 6:53 ` [PATCH 01/30] blk-mq: factor out a blk_mq_alloc_sq_tag_set helper Christoph Hellwig
2021-06-02 6:53 ` [PATCH 02/30] blk-mq: improve the blk_mq_init_allocated_queue interface Christoph Hellwig
2021-06-02 6:53 ` [PATCH 03/30] blk-mq: add the blk_mq_alloc_disk APIs Christoph Hellwig
2021-06-03 0:03 ` Chaitanya Kulkarni
2021-06-02 6:53 ` [PATCH 04/30] virtio-blk: use blk_mq_alloc_disk Christoph Hellwig
2021-06-02 6:53 ` [PATCH 05/30] pcd: " Christoph Hellwig
2021-06-02 6:53 ` Christoph Hellwig [this message]
2021-06-02 6:53 ` [PATCH 07/30] ms_block: " Christoph Hellwig
2021-06-03 15:36 ` Ulf Hansson
2021-06-02 6:53 ` [PATCH 08/30] mspro: " Christoph Hellwig
2021-06-03 15:36 ` Ulf Hansson
2021-06-02 6:53 ` [PATCH 09/30] mtd_blkdevs: " Christoph Hellwig
[not found] ` <CGME20210615154746eucas1p1321b6f1cf38d21899632e132cf025e61@eucas1p1.samsung.com>
2021-06-15 15:47 ` Marek Szyprowski
2021-06-15 15:58 ` Christoph Hellwig
2021-06-15 16:28 ` Marek Szyprowski
2021-06-02 6:53 ` [PATCH 10/30] ps3disk: " Christoph Hellwig
2021-06-06 15:58 ` Geoff Levand
2021-06-02 6:53 ` [PATCH 11/30] swim3: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 12/30] swim: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 13/30] sunvdc: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 14/30] gdrom: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 15/30] blk-mq: remove blk_mq_init_sq_queue Christoph Hellwig
2021-06-03 0:04 ` Chaitanya Kulkarni
2021-06-02 6:53 ` [PATCH 16/30] aoe: use blk_mq_alloc_disk and blk_cleanup_disk Christoph Hellwig
2021-06-02 6:53 ` [PATCH 17/30] floppy: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 18/30] loop: " Christoph Hellwig
2021-06-03 0:05 ` Chaitanya Kulkarni
2021-06-02 6:53 ` [PATCH 19/30] nbd: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 20/30] nullb: use blk_mq_alloc_disk Christoph Hellwig
2021-06-03 0:10 ` Chaitanya Kulkarni
2021-06-08 5:39 ` Christoph Hellwig
2021-06-02 6:53 ` [PATCH 21/30] pd: use blk_mq_alloc_disk and blk_cleanup_disk Christoph Hellwig
2021-06-02 6:53 ` [PATCH 22/30] rbd: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 23/30] rnbd: " Christoph Hellwig
2021-06-02 7:49 ` Jinpu Wang
2021-06-02 6:53 ` [PATCH 24/30] sx8: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 25/30] xen-blkfront: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 26/30] ubi: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 27/30] scm_blk: " Christoph Hellwig
2021-06-02 12:02 ` Niklas Schnelle
2021-06-02 6:53 ` [PATCH 28/30] amiflop: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 29/30] ataflop: " Christoph Hellwig
2021-06-02 6:53 ` [PATCH 30/30] z2ram: " Christoph Hellwig
2021-06-04 15:58 ` simplify gendisk and request_queue allocation for blk-mq based drivers Konrad Rzeszutek Wilk
2021-06-05 14:02 ` Christoph Hellwig
2021-06-11 17:55 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210602065345.355274-7-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=borntraeger@de.ibm.com \
--cc=ceph-devel@vger.kernel.org \
--cc=dm-devel@redhat.com \
--cc=efremov@linux.com \
--cc=geoff@infradead.org \
--cc=gor@linux.ibm.com \
--cc=haris.iqbal@ionos.com \
--cc=hca@linux.ibm.com \
--cc=idryomov@gmail.com \
--cc=jasowang@redhat.com \
--cc=jinpu.wang@ionos.com \
--cc=josef@toxicpanda.com \
--cc=justin@coraid.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maximlevitsky@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=mst@redhat.com \
--cc=nbd@other.debian.org \
--cc=oakad@yahoo.com \
--cc=richard@nod.at \
--cc=roger.pau@citrix.com \
--cc=snitzer@redhat.com \
--cc=tim@cyberelk.net \
--cc=vigneshr@ti.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).