From: Christoph Hellwig <hch@lst.de>
To: Richard Weinberger <richard@nod.at>,
Anton Ivanov <anton.ivanov@cambridgegreys.com>,
Johannes Berg <johannes@sipsolutions.net>,
Jens Axboe <axboe@kernel.dk>
Cc: linux-um@lists.infradead.org, linux-block@vger.kernel.org
Subject: [PATCH 6/7] ubd: remove the queue pointer in struct ubd
Date: Thu, 22 Feb 2024 08:24:16 +0100 [thread overview]
Message-ID: <20240222072417.3773131-7-hch@lst.de> (raw)
In-Reply-To: <20240222072417.3773131-1-hch@lst.de>
No need for it now, everything goes through the gendisk.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/um/drivers/ubd_kern.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index c5d32e75426366..9bf1d6a88bae59 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -163,7 +163,6 @@ struct ubd {
struct cow cow;
struct platform_device pdev;
struct gendisk *disk;
- struct request_queue *queue;
struct blk_mq_tag_set tag_set;
spinlock_t lock;
};
@@ -892,10 +891,9 @@ static int ubd_add(int n, char **error_out)
err = PTR_ERR(disk);
goto out_cleanup_tags;
}
- ubd_dev->queue = disk->queue;
blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
- blk_queue_write_cache(ubd_dev->queue, true, false);
+ blk_queue_write_cache(disk->queue, true, false);
disk->major = UBD_MAJOR;
disk->first_minor = n << UBD_SHIFT;
disk->minors = 1 << UBD_SHIFT;
--
2.39.2
next prev parent reply other threads:[~2024-02-22 7:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 7:24 ubd cleanups Christoph Hellwig
2024-02-22 7:24 ` [PATCH 1/7] ubd: remove the ubd_gendisk array Christoph Hellwig
2024-02-27 20:52 ` Richard Weinberger
2024-02-22 7:24 ` [PATCH 2/7] ubd: remove ubd_disk_register Christoph Hellwig
2024-02-27 20:56 ` Richard Weinberger
2024-02-22 7:24 ` [PATCH 3/7] ubd: move setting the nonrot flag to ubd_add Christoph Hellwig
2024-02-27 20:56 ` Richard Weinberger
2024-02-22 7:24 ` [PATCH 4/7] ubd: move setting the variable queue limits " Christoph Hellwig
2024-02-27 21:00 ` Richard Weinberger
2024-02-22 7:24 ` [PATCH 5/7] ubd: move set_disk_ro " Christoph Hellwig
2024-02-27 21:00 ` Richard Weinberger
2024-02-22 7:24 ` Christoph Hellwig [this message]
2024-02-27 21:01 ` [PATCH 6/7] ubd: remove the queue pointer in struct ubd Richard Weinberger
2024-02-22 7:24 ` [PATCH 7/7] ubd: open the backing files in ubd_add Christoph Hellwig
2024-02-27 21:05 ` Richard Weinberger
2024-02-27 21:21 ` ubd cleanups 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=20240222072417.3773131-7-hch@lst.de \
--to=hch@lst.de \
--cc=anton.ivanov@cambridgegreys.com \
--cc=axboe@kernel.dk \
--cc=johannes@sipsolutions.net \
--cc=linux-block@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=richard@nod.at \
/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).