block: remove the NULL queue check in generic_make_request_checks
authorChristoph Hellwig <hch@lst.de>
Wed, 1 Jul 2020 08:59:41 +0000 (10:59 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 1 Jul 2020 13:27:24 +0000 (07:27 -0600)
All registers disks must have a valid queue pointer, so don't bother to
log a warning for that case.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c

index 95dca74..37435d0 100644 (file)
@@ -973,22 +973,12 @@ static inline blk_status_t blk_check_zone_append(struct request_queue *q,
 static noinline_for_stack bool
 generic_make_request_checks(struct bio *bio)
 {
-       struct request_queue *q;
+       struct request_queue *q = bio->bi_disk->queue;
        int nr_sectors = bio_sectors(bio);
        blk_status_t status = BLK_STS_IOERR;
-       char b[BDEVNAME_SIZE];
 
        might_sleep();
 
-       q = bio->bi_disk->queue;
-       if (unlikely(!q)) {
-               printk(KERN_ERR
-                      "generic_make_request: Trying to access "
-                       "nonexistent block-device %s (%Lu)\n",
-                       bio_devname(bio, b), (long long)bio->bi_iter.bi_sector);
-               goto end_io;
-       }
-
        /*
         * For a REQ_NOWAIT based request, return -EOPNOTSUPP
         * if queue is not a request based queue.