ubd: remove the queue pointer in struct ubd
authorChristoph Hellwig <hch@lst.de>
Thu, 22 Feb 2024 07:24:16 +0000 (08:24 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 27 Feb 2024 21:21:15 +0000 (14:21 -0700)
No need for it now, everything goes through the gendisk.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Richard Weinberger <richard@nod.at>
Link: https://lore.kernel.org/r/20240222072417.3773131-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
arch/um/drivers/ubd_kern.c

index c5d32e75426366d9af9a0007b8424608c833e518..9bf1d6a88bae59b9b63afe8fd5ba8db04318eab9 100644 (file)
@@ -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;