[11/16] drbd: don't override the queue_lock
diff mbox series

Message ID 20181114160219.28328-12-hch@lst.de
State New
Headers show
Series
  • [01/16] block: remove QUEUE_FLAG_BYPASS and ->bypass
Related show

Commit Message

Christoph Hellwig Nov. 14, 2018, 4:02 p.m. UTC
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.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/block/drbd/drbd_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Hannes Reinecke Nov. 15, 2018, 6:58 a.m. UTC | #1
On 11/14/18 5:02 PM, Christoph Hellwig wrote:
> 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.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>   drivers/block/drbd/drbd_main.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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;
> 
Reviewed-by: Hannes Reinecke <hare@suse.com>

Cheers,

Hannes

Patch
diff mbox series

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;