]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bcache: remove a duplicate ->make_request_fn assignment
authorChristoph Hellwig <hch@lst.de>
Sat, 25 Apr 2020 07:53:34 +0000 (09:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:32:32 +0000 (09:32 +0200)
[ Upstream commit a91b2014fc31dc6eaa02ca33aa3b4d1b6e4a0207 ]

The make_request_fn pointer should only be assigned by blk_alloc_queue.
Fix a left over manual initialization.

Fixes: ff27668ce809 ("bcache: pass the make_request methods to blk_queue_make_request")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/bcache/request.c

index 71a90fbec314bc422c3c31c09ed4b60465779232..77d1a26975174aa761822f982f2e53675d70534c 100644 (file)
@@ -1372,7 +1372,6 @@ void bch_flash_dev_request_init(struct bcache_device *d)
 {
        struct gendisk *g = d->disk;
 
-       g->queue->make_request_fn               = flash_dev_make_request;
        g->queue->backing_dev_info->congested_fn = flash_dev_congested;
        d->cache_miss                           = flash_dev_cache_miss;
        d->ioctl                                = flash_dev_ioctl;