summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-11-14 17:02:15 +0100
committerJens Axboe <axboe@kernel.dk>2018-11-15 12:13:31 -0700
commit68fc68f2ff620852ee43ee7a2831bc5eeb9472d6 (patch)
treeba5d0d6a8ff595a858cc493d01732cc956e1ab2c /drivers/block
parent8295a69bdc3cb8707e645f9b2de6f3019a521882 (diff)
downloadlinux-68fc68f2ff620852ee43ee7a2831bc5eeb9472d6.tar.bz2
umem: don't override the queue_lock
The umem card->lock and the block layer queue_lock are used for entirely different resources. Stop using card->lock as the block layer queue_lock. Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/umem.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index be3e3ab79950..8a27b5adc2b3 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -888,8 +888,7 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
card->biotail = &card->bio;
spin_lock_init(&card->lock);
- card->queue = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE,
- &card->lock);
+ card->queue = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE, NULL);
if (!card->queue)
goto failed_alloc;