summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig2018-11-14 17:02:14 +0100
committerJens Axboe2018-11-15 20:13:29 +0100
commit8295a69bdc3cb8707e645f9b2de6f3019a521882 (patch)
tree528e12d09fc793b43447ae1f94b3cb61757aad21
parentblk-cgroup: move locking into blkg_destroy_all (diff)
downloadkernel-qcow2-linux-8295a69bdc3cb8707e645f9b2de6f3019a521882.tar.gz
kernel-qcow2-linux-8295a69bdc3cb8707e645f9b2de6f3019a521882.tar.xz
kernel-qcow2-linux-8295a69bdc3cb8707e645f9b2de6f3019a521882.zip
drbd: don't override the queue_lock
The DRBD req_lock and block layer queue_lock are used for entirely different resources. Stop using the req_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>
-rw-r--r--drivers/block/drbd/drbd_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index fa8204214ac0..b66c59ce6260 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2792,7 +2792,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
drbd_init_set_defaults(device);
- q = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE, &resource->req_lock);
+ q = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE, NULL);
if (!q)
goto out_no_q;
device->rq_queue = q;