All of lore.kernel.org
 help / color / mirror / Atom feed
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 12/30] swim: use blk_mq_alloc_disk
Date: Wed,  2 Jun 2021 09:53:27 +0300	[thread overview]
Message-ID: <20210602065345.355274-13-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/swim.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 2917b21f48ff..7ccc8d2a41bc 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -800,23 +800,20 @@ static int swim_floppy_init(struct swim_priv *swd)
 	spin_lock_init(&swd->lock);
 
 	for (drive = 0; drive < swd->floppy_count; drive++) {
-		struct request_queue *q;
-
-		swd->unit[drive].disk = alloc_disk(1);
-		if (swd->unit[drive].disk == NULL) {
-			err = -ENOMEM;
+		err = blk_mq_alloc_sq_tag_set(&swd->unit[drive].tag_set,
+				&swim_mq_ops, 2, BLK_MQ_F_SHOULD_MERGE);
+		if (err)
 			goto exit_put_disks;
-		}
 
-		q = blk_mq_init_sq_queue(&swd->unit[drive].tag_set, &swim_mq_ops,
-						2, BLK_MQ_F_SHOULD_MERGE);
-		if (IS_ERR(q)) {
-			err = PTR_ERR(q);
+		swd->unit[drive].disk =
+			blk_mq_alloc_disk(&swd->unit[drive].tag_set,
+					  &swd->unit[drive]);
+		if (IS_ERR(swd->unit[drive].disk)) {
+			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
+			err = PTR_ERR(swd->unit[drive].disk);
 			goto exit_put_disks;
 		}
 
-		swd->unit[drive].disk->queue = q;
-		swd->unit[drive].disk->queue->queuedata = &swd->unit[drive];
 		swd->unit[drive].swd = swd;
 	}
 
@@ -824,6 +821,7 @@ static int swim_floppy_init(struct swim_priv *swd)
 		swd->unit[drive].disk->flags = GENHD_FL_REMOVABLE;
 		swd->unit[drive].disk->major = FLOPPY_MAJOR;
 		swd->unit[drive].disk->first_minor = drive;
+		swd->unit[drive].disk->minors = 1;
 		sprintf(swd->unit[drive].disk->disk_name, "fd%d", drive);
 		swd->unit[drive].disk->fops = &floppy_fops;
 		swd->unit[drive].disk->events = DISK_EVENT_MEDIA_CHANGE;
@@ -839,14 +837,10 @@ static int swim_floppy_init(struct swim_priv *swd)
 	do {
 		struct gendisk *disk = swd->unit[drive].disk;
 
-		if (disk) {
-			if (disk->queue) {
-				blk_cleanup_queue(disk->queue);
-				disk->queue = NULL;
-			}
-			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
-			put_disk(disk);
-		}
+		if (!disk)
+			continue;
+		blk_cleanup_disk(disk);
+		blk_mq_free_tag_set(&swd->unit[drive].tag_set);
 	} while (drive--);
 	return err;
 }
-- 
2.30.2


WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Justin Sanders" <justin@coraid.com>,
	"Vignesh Raghavendra" <vigneshr@ti.com>,
	"Mike Snitzer" <snitzer@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>,
	virtualization@lists.linux-foundation.org, dm-devel@redhat.com,
	"Md. Haris Iqbal" <haris.iqbal@ionos.com>,
	"Miquel Raynal" <miquel.raynal@bootlin.com>,
	"Jack Wang" <jinpu.wang@ionos.com>,
	"Tim Waugh" <tim@cyberelk.net>,
	linux-s390@vger.kernel.org, "Alex Dubov" <oakad@yahoo.com>,
	"Richard Weinberger" <richard@nod.at>,
	"Christian Borntraeger" <borntraeger@de.ibm.com>,
	xen-devel@lists.xenproject.org,
	"Ilya Dryomov" <idryomov@gmail.com>,
	"Vasily Gorbik" <gor@linux.ibm.com>,
	"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
	"Heiko Carstens" <hca@linux.ibm.com>,
	"Josef Bacik" <josef@toxicpanda.com>,
	"Denis Efremov" <efremov@linux.com>,
	nbd@other.debian.org, linux-block@vger.kernel.org,
	ceph-devel@vger.kernel.org,
	"Maxim Levitsky" <maximlevitsky@gmail.com>,
	"Geoff Levand" <geoff@infradead.org>,
	linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org,
	linuxppc-dev@lists.ozlabs.org,
	"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH 12/30] swim: use blk_mq_alloc_disk
Date: Wed,  2 Jun 2021 09:53:27 +0300	[thread overview]
Message-ID: <20210602065345.355274-13-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/swim.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 2917b21f48ff..7ccc8d2a41bc 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -800,23 +800,20 @@ static int swim_floppy_init(struct swim_priv *swd)
 	spin_lock_init(&swd->lock);
 
 	for (drive = 0; drive < swd->floppy_count; drive++) {
-		struct request_queue *q;
-
-		swd->unit[drive].disk = alloc_disk(1);
-		if (swd->unit[drive].disk == NULL) {
-			err = -ENOMEM;
+		err = blk_mq_alloc_sq_tag_set(&swd->unit[drive].tag_set,
+				&swim_mq_ops, 2, BLK_MQ_F_SHOULD_MERGE);
+		if (err)
 			goto exit_put_disks;
-		}
 
-		q = blk_mq_init_sq_queue(&swd->unit[drive].tag_set, &swim_mq_ops,
-						2, BLK_MQ_F_SHOULD_MERGE);
-		if (IS_ERR(q)) {
-			err = PTR_ERR(q);
+		swd->unit[drive].disk =
+			blk_mq_alloc_disk(&swd->unit[drive].tag_set,
+					  &swd->unit[drive]);
+		if (IS_ERR(swd->unit[drive].disk)) {
+			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
+			err = PTR_ERR(swd->unit[drive].disk);
 			goto exit_put_disks;
 		}
 
-		swd->unit[drive].disk->queue = q;
-		swd->unit[drive].disk->queue->queuedata = &swd->unit[drive];
 		swd->unit[drive].swd = swd;
 	}
 
@@ -824,6 +821,7 @@ static int swim_floppy_init(struct swim_priv *swd)
 		swd->unit[drive].disk->flags = GENHD_FL_REMOVABLE;
 		swd->unit[drive].disk->major = FLOPPY_MAJOR;
 		swd->unit[drive].disk->first_minor = drive;
+		swd->unit[drive].disk->minors = 1;
 		sprintf(swd->unit[drive].disk->disk_name, "fd%d", drive);
 		swd->unit[drive].disk->fops = &floppy_fops;
 		swd->unit[drive].disk->events = DISK_EVENT_MEDIA_CHANGE;
@@ -839,14 +837,10 @@ static int swim_floppy_init(struct swim_priv *swd)
 	do {
 		struct gendisk *disk = swd->unit[drive].disk;
 
-		if (disk) {
-			if (disk->queue) {
-				blk_cleanup_queue(disk->queue);
-				disk->queue = NULL;
-			}
-			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
-			put_disk(disk);
-		}
+		if (!disk)
+			continue;
+		blk_cleanup_disk(disk);
+		blk_mq_free_tag_set(&swd->unit[drive].tag_set);
 	} while (drive--);
 	return err;
 }
-- 
2.30.2


WARNING: multiple messages have this Message-ID
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 12/30] swim: use blk_mq_alloc_disk
Date: Wed,  2 Jun 2021 09:53:27 +0300	[thread overview]
Message-ID: <20210602065345.355274-13-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/swim.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 2917b21f48ff..7ccc8d2a41bc 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -800,23 +800,20 @@ static int swim_floppy_init(struct swim_priv *swd)
 	spin_lock_init(&swd->lock);
 
 	for (drive = 0; drive < swd->floppy_count; drive++) {
-		struct request_queue *q;
-
-		swd->unit[drive].disk = alloc_disk(1);
-		if (swd->unit[drive].disk == NULL) {
-			err = -ENOMEM;
+		err = blk_mq_alloc_sq_tag_set(&swd->unit[drive].tag_set,
+				&swim_mq_ops, 2, BLK_MQ_F_SHOULD_MERGE);
+		if (err)
 			goto exit_put_disks;
-		}
 
-		q = blk_mq_init_sq_queue(&swd->unit[drive].tag_set, &swim_mq_ops,
-						2, BLK_MQ_F_SHOULD_MERGE);
-		if (IS_ERR(q)) {
-			err = PTR_ERR(q);
+		swd->unit[drive].disk =
+			blk_mq_alloc_disk(&swd->unit[drive].tag_set,
+					  &swd->unit[drive]);
+		if (IS_ERR(swd->unit[drive].disk)) {
+			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
+			err = PTR_ERR(swd->unit[drive].disk);
 			goto exit_put_disks;
 		}
 
-		swd->unit[drive].disk->queue = q;
-		swd->unit[drive].disk->queue->queuedata = &swd->unit[drive];
 		swd->unit[drive].swd = swd;
 	}
 
@@ -824,6 +821,7 @@ static int swim_floppy_init(struct swim_priv *swd)
 		swd->unit[drive].disk->flags = GENHD_FL_REMOVABLE;
 		swd->unit[drive].disk->major = FLOPPY_MAJOR;
 		swd->unit[drive].disk->first_minor = drive;
+		swd->unit[drive].disk->minors = 1;
 		sprintf(swd->unit[drive].disk->disk_name, "fd%d", drive);
 		swd->unit[drive].disk->fops = &floppy_fops;
 		swd->unit[drive].disk->events = DISK_EVENT_MEDIA_CHANGE;
@@ -839,14 +837,10 @@ static int swim_floppy_init(struct swim_priv *swd)
 	do {
 		struct gendisk *disk = swd->unit[drive].disk;
 
-		if (disk) {
-			if (disk->queue) {
-				blk_cleanup_queue(disk->queue);
-				disk->queue = NULL;
-			}
-			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
-			put_disk(disk);
-		}
+		if (!disk)
+			continue;
+		blk_cleanup_disk(disk);
+		blk_mq_free_tag_set(&swd->unit[drive].tag_set);
 	} while (drive--);
 	return err;
 }
-- 
2.30.2


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Justin Sanders" <justin@coraid.com>,
	"Vignesh Raghavendra" <vigneshr@ti.com>,
	"Mike Snitzer" <snitzer@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	virtualization@lists.linux-foundation.org, dm-devel@redhat.com,
	"Md. Haris Iqbal" <haris.iqbal@ionos.com>,
	"Miquel Raynal" <miquel.raynal@bootlin.com>,
	"Jack Wang" <jinpu.wang@ionos.com>,
	"Tim Waugh" <tim@cyberelk.net>,
	linux-s390@vger.kernel.org, "Alex Dubov" <oakad@yahoo.com>,
	"Richard Weinberger" <richard@nod.at>,
	"Christian Borntraeger" <borntraeger@de.ibm.com>,
	xen-devel@lists.xenproject.org,
	"Ilya Dryomov" <idryomov@gmail.com>,
	"Vasily Gorbik" <gor@linux.ibm.com>,
	"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
	"Heiko Carstens" <hca@linux.ibm.com>,
	"Josef Bacik" <josef@toxicpanda.com>,
	"Denis Efremov" <efremov@linux.com>,
	nbd@other.debian.org, linux-block@vger.kernel.org,
	ceph-devel@vger.kernel.org,
	"Maxim Levitsky" <maximlevitsky@gmail.com>,
	"Geoff Levand" <geoff@infradead.org>,
	linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org,
	linuxppc-dev@lists.ozlabs.org,
	"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH 12/30] swim: use blk_mq_alloc_disk
Date: Wed,  2 Jun 2021 09:53:27 +0300	[thread overview]
Message-ID: <20210602065345.355274-13-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/swim.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 2917b21f48ff..7ccc8d2a41bc 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -800,23 +800,20 @@ static int swim_floppy_init(struct swim_priv *swd)
 	spin_lock_init(&swd->lock);
 
 	for (drive = 0; drive < swd->floppy_count; drive++) {
-		struct request_queue *q;
-
-		swd->unit[drive].disk = alloc_disk(1);
-		if (swd->unit[drive].disk == NULL) {
-			err = -ENOMEM;
+		err = blk_mq_alloc_sq_tag_set(&swd->unit[drive].tag_set,
+				&swim_mq_ops, 2, BLK_MQ_F_SHOULD_MERGE);
+		if (err)
 			goto exit_put_disks;
-		}
 
-		q = blk_mq_init_sq_queue(&swd->unit[drive].tag_set, &swim_mq_ops,
-						2, BLK_MQ_F_SHOULD_MERGE);
-		if (IS_ERR(q)) {
-			err = PTR_ERR(q);
+		swd->unit[drive].disk =
+			blk_mq_alloc_disk(&swd->unit[drive].tag_set,
+					  &swd->unit[drive]);
+		if (IS_ERR(swd->unit[drive].disk)) {
+			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
+			err = PTR_ERR(swd->unit[drive].disk);
 			goto exit_put_disks;
 		}
 
-		swd->unit[drive].disk->queue = q;
-		swd->unit[drive].disk->queue->queuedata = &swd->unit[drive];
 		swd->unit[drive].swd = swd;
 	}
 
@@ -824,6 +821,7 @@ static int swim_floppy_init(struct swim_priv *swd)
 		swd->unit[drive].disk->flags = GENHD_FL_REMOVABLE;
 		swd->unit[drive].disk->major = FLOPPY_MAJOR;
 		swd->unit[drive].disk->first_minor = drive;
+		swd->unit[drive].disk->minors = 1;
 		sprintf(swd->unit[drive].disk->disk_name, "fd%d", drive);
 		swd->unit[drive].disk->fops = &floppy_fops;
 		swd->unit[drive].disk->events = DISK_EVENT_MEDIA_CHANGE;
@@ -839,14 +837,10 @@ static int swim_floppy_init(struct swim_priv *swd)
 	do {
 		struct gendisk *disk = swd->unit[drive].disk;
 
-		if (disk) {
-			if (disk->queue) {
-				blk_cleanup_queue(disk->queue);
-				disk->queue = NULL;
-			}
-			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
-			put_disk(disk);
-		}
+		if (!disk)
+			continue;
+		blk_cleanup_disk(disk);
+		blk_mq_free_tag_set(&swd->unit[drive].tag_set);
 	} while (drive--);
 	return err;
 }
-- 
2.30.2

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Justin Sanders" <justin@coraid.com>,
	"Vignesh Raghavendra" <vigneshr@ti.com>,
	"Mike Snitzer" <snitzer@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>,
	virtualization@lists.linux-foundation.org, dm-devel@redhat.com,
	"Md. Haris Iqbal" <haris.iqbal@ionos.com>,
	"Miquel Raynal" <miquel.raynal@bootlin.com>,
	"Jack Wang" <jinpu.wang@ionos.com>,
	"Tim Waugh" <tim@cyberelk.net>,
	linux-s390@vger.kernel.org, "Alex Dubov" <oakad@yahoo.com>,
	"Richard Weinberger" <richard@nod.at>,
	"Christian Borntraeger" <borntraeger@de.ibm.com>,
	xen-devel@lists.xenproject.org,
	"Ilya Dryomov" <idryomov@gmail.com>,
	"Vasily Gorbik" <gor@linux.ibm.com>,
	"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
	"Heiko Carstens" <hca@linux.ibm.com>,
	"Josef Bacik" <josef@toxicpanda.com>,
	"Denis Efremov" <efremov@linux.com>,
	nbd@other.debian.org, linux-block@vger.kernel.org,
	ceph-devel@vger.kernel.org,
	"Maxim Levitsky" <maximlevitsky@gmail.com>,
	"Geoff Levand" <geoff@infradead.org>,
	linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org,
	linuxppc-dev@lists.ozlabs.org,
	"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [dm-devel] [PATCH 12/30] swim: use blk_mq_alloc_disk
Date: Wed,  2 Jun 2021 09:53:27 +0300	[thread overview]
Message-ID: <20210602065345.355274-13-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/swim.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 2917b21f48ff..7ccc8d2a41bc 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -800,23 +800,20 @@ static int swim_floppy_init(struct swim_priv *swd)
 	spin_lock_init(&swd->lock);
 
 	for (drive = 0; drive < swd->floppy_count; drive++) {
-		struct request_queue *q;
-
-		swd->unit[drive].disk = alloc_disk(1);
-		if (swd->unit[drive].disk == NULL) {
-			err = -ENOMEM;
+		err = blk_mq_alloc_sq_tag_set(&swd->unit[drive].tag_set,
+				&swim_mq_ops, 2, BLK_MQ_F_SHOULD_MERGE);
+		if (err)
 			goto exit_put_disks;
-		}
 
-		q = blk_mq_init_sq_queue(&swd->unit[drive].tag_set, &swim_mq_ops,
-						2, BLK_MQ_F_SHOULD_MERGE);
-		if (IS_ERR(q)) {
-			err = PTR_ERR(q);
+		swd->unit[drive].disk =
+			blk_mq_alloc_disk(&swd->unit[drive].tag_set,
+					  &swd->unit[drive]);
+		if (IS_ERR(swd->unit[drive].disk)) {
+			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
+			err = PTR_ERR(swd->unit[drive].disk);
 			goto exit_put_disks;
 		}
 
-		swd->unit[drive].disk->queue = q;
-		swd->unit[drive].disk->queue->queuedata = &swd->unit[drive];
 		swd->unit[drive].swd = swd;
 	}
 
@@ -824,6 +821,7 @@ static int swim_floppy_init(struct swim_priv *swd)
 		swd->unit[drive].disk->flags = GENHD_FL_REMOVABLE;
 		swd->unit[drive].disk->major = FLOPPY_MAJOR;
 		swd->unit[drive].disk->first_minor = drive;
+		swd->unit[drive].disk->minors = 1;
 		sprintf(swd->unit[drive].disk->disk_name, "fd%d", drive);
 		swd->unit[drive].disk->fops = &floppy_fops;
 		swd->unit[drive].disk->events = DISK_EVENT_MEDIA_CHANGE;
@@ -839,14 +837,10 @@ static int swim_floppy_init(struct swim_priv *swd)
 	do {
 		struct gendisk *disk = swd->unit[drive].disk;
 
-		if (disk) {
-			if (disk->queue) {
-				blk_cleanup_queue(disk->queue);
-				disk->queue = NULL;
-			}
-			blk_mq_free_tag_set(&swd->unit[drive].tag_set);
-			put_disk(disk);
-		}
+		if (!disk)
+			continue;
+		blk_cleanup_disk(disk);
+		blk_mq_free_tag_set(&swd->unit[drive].tag_set);
 	} while (drive--);
 	return err;
 }
-- 
2.30.2

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


  parent reply	other threads:[~2021-06-02  6:55 UTC|newest]

Thread overview: 226+ 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 ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53 ` Christoph Hellwig
2021-06-02  6:53 ` Christoph Hellwig
2021-06-02  6:53 ` 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   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` 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   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 03/30] blk-mq: add the blk_mq_alloc_disk APIs Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-03  0:03   ` Chaitanya Kulkarni
2021-06-03  0:03     ` [dm-devel] " Chaitanya Kulkarni
2021-06-03  0:03     ` Chaitanya Kulkarni
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   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 05/30] pcd: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 06/30] pf: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 07/30] ms_block: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-03 15:36   ` Ulf Hansson
2021-06-03 15:36     ` [dm-devel] " Ulf Hansson
2021-06-03 15:36     ` Ulf Hansson
2021-06-03 15:36     ` Ulf Hansson
2021-06-03 15:36     ` Ulf Hansson
2021-06-02  6:53 ` [PATCH 08/30] mspro: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-03 15:36   ` Ulf Hansson
2021-06-03 15:36     ` [dm-devel] " Ulf Hansson
2021-06-03 15:36     ` Ulf Hansson
2021-06-03 15:36     ` Ulf Hansson
2021-06-03 15:36     ` Ulf Hansson
2021-06-02  6:53 ` [PATCH 09/30] mtd_blkdevs: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
     [not found]   ` <CGME20210615154746eucas1p1321b6f1cf38d21899632e132cf025e61@eucas1p1.samsung.com>
2021-06-15 15:47     ` Marek Szyprowski
2021-06-15 15:47       ` [dm-devel] " Marek Szyprowski
2021-06-15 15:47       ` Marek Szyprowski
2021-06-15 15:47       ` Marek Szyprowski
2021-06-15 15:58       ` Christoph Hellwig
2021-06-15 15:58         ` [dm-devel] " Christoph Hellwig
2021-06-15 15:58         ` Christoph Hellwig
2021-06-15 15:58         ` Christoph Hellwig
2021-06-15 15:58         ` Christoph Hellwig
2021-06-15 16:28         ` Marek Szyprowski
2021-06-15 16:28           ` [dm-devel] " Marek Szyprowski
2021-06-15 16:28           ` Marek Szyprowski
2021-06-15 16:28           ` Marek Szyprowski
2021-06-02  6:53 ` [PATCH 10/30] ps3disk: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-06 15:58   ` Geoff Levand
2021-06-06 15:58     ` [dm-devel] " Geoff Levand
2021-06-06 15:58     ` Geoff Levand
2021-06-06 15:58     ` Geoff Levand
2021-06-02  6:53 ` [PATCH 11/30] swim3: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` Christoph Hellwig [this message]
2021-06-02  6:53   ` [dm-devel] [PATCH 12/30] swim: " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 13/30] sunvdc: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 14/30] gdrom: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 15/30] blk-mq: remove blk_mq_init_sq_queue Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-03  0:04   ` Chaitanya Kulkarni
2021-06-03  0:04     ` [dm-devel] " Chaitanya Kulkarni
2021-06-03  0:04     ` Chaitanya Kulkarni
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   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 17/30] floppy: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 18/30] loop: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-03  0:05   ` Chaitanya Kulkarni
2021-06-03  0:05     ` [dm-devel] " Chaitanya Kulkarni
2021-06-03  0:05     ` Chaitanya Kulkarni
2021-06-03  0:05     ` Chaitanya Kulkarni
2021-06-02  6:53 ` [PATCH 19/30] nbd: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 20/30] nullb: use blk_mq_alloc_disk Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-03  0:10   ` Chaitanya Kulkarni
2021-06-03  0:10     ` [dm-devel] " Chaitanya Kulkarni
2021-06-03  0:10     ` Chaitanya Kulkarni
2021-06-03  0:10     ` Chaitanya Kulkarni
2021-06-08  5:39     ` Christoph Hellwig
2021-06-08  5:39       ` [dm-devel] " Christoph Hellwig
2021-06-08  5:39       ` Christoph Hellwig
2021-06-08  5:39       ` Christoph Hellwig
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   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 22/30] rbd: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 23/30] rnbd: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  7:49   ` Jinpu Wang
2021-06-02  7:49     ` [dm-devel] " Jinpu Wang
2021-06-02  7:49     ` Jinpu Wang
2021-06-02  7:49     ` Jinpu Wang
2021-06-02  6:53 ` [PATCH 24/30] sx8: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 25/30] xen-blkfront: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 26/30] ubi: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 27/30] scm_blk: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02 12:02   ` Niklas Schnelle
2021-06-02 12:02     ` [dm-devel] " Niklas Schnelle
2021-06-02 12:02     ` Niklas Schnelle
2021-06-02 12:02     ` Niklas Schnelle
2021-06-02  6:53 ` [PATCH 28/30] amiflop: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 29/30] ataflop: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53 ` [PATCH 30/30] z2ram: " Christoph Hellwig
2021-06-02  6:53   ` [dm-devel] " Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-02  6:53   ` Christoph Hellwig
2021-06-04 15:58 ` simplify gendisk and request_queue allocation for blk-mq based drivers Konrad Rzeszutek Wilk
2021-06-04 15:58   ` [dm-devel] " Konrad Rzeszutek Wilk
2021-06-04 15:58   ` Konrad Rzeszutek Wilk
2021-06-04 15:58   ` Konrad Rzeszutek Wilk
2021-06-04 15:58   ` Konrad Rzeszutek Wilk
2021-06-05 14:02   ` Christoph Hellwig
2021-06-05 14:02     ` [dm-devel] " Christoph Hellwig
2021-06-05 14:02     ` Christoph Hellwig
2021-06-05 14:02     ` Christoph Hellwig
2021-06-05 14:02     ` Christoph Hellwig
2021-06-11 17:55 ` Jens Axboe
2021-06-11 17:55   ` [dm-devel] " Jens Axboe
2021-06-11 17:55   ` Jens Axboe
2021-06-11 17:55   ` Jens Axboe
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-13-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 \
    --subject='Re: [PATCH 12/30] swim: use blk_mq_alloc_disk' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.