Commit 6d469642 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove the lock argument to blk_alloc_queue_node 



With the legacy request path gone there is no real need to override the
queue_lock.

Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 310df020

block/blk-core.c

+3 −13
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ EXPORT_SYMBOL(blk_cleanup_queue); 


struct request_queue *blk_alloc_queue(gfp_t gfp_mask)

{

	return blk_alloc_queue_node(gfp_mask, NUMA_NO_NODE, NULL);

	return blk_alloc_queue_node(gfp_mask, NUMA_NO_NODE);

}

EXPORT_SYMBOL(blk_alloc_queue);
@@ -473,17 +473,8 @@ static void blk_rq_timed_out_timer(struct timer_list *t) 
 * blk_alloc_queue_node - allocate a request queue

 * @gfp_mask: memory allocation flags

 * @node_id: NUMA node to allocate memory from

 * @lock: For legacy queues, pointer to a spinlock that will be used to e.g.

 *        serialize calls to the legacy .request_fn() callback. Ignored for

 *	  blk-mq request queues.

 *

 * Note: pass the queue lock as the third argument to this function instead of

 * setting the queue lock pointer explicitly to avoid triggering a sporadic

 * crash in the blkcg code. This function namely calls blkcg_init_queue() and

 * the queue lock pointer must be set before blkcg_init_queue() is called.

 */

struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id,

					   spinlock_t *lock)

struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)

{

	struct request_queue *q;

	int ret;
@@ -534,8 +525,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id, 
#endif

	mutex_init(&q->sysfs_lock);

	spin_lock_init(&q->__queue_lock);



	q->queue_lock = lock ? : &q->__queue_lock;

	q->queue_lock = &q->__queue_lock;



	init_waitqueue_head(&q->mq_freeze_wq);

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -2548,7 +2548,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) 
{

	struct request_queue *uninit_q, *q;



	uninit_q = blk_alloc_queue_node(GFP_KERNEL, set->numa_node, NULL);

	uninit_q = blk_alloc_queue_node(GFP_KERNEL, set->numa_node);

	if (!uninit_q)

		return ERR_PTR(-ENOMEM);

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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, NULL);

	q = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE);

	if (!q)

		goto out_no_q;

	device->rq_queue = q;

drivers/block/null_blk_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1659,8 +1659,7 @@ static int null_add_dev(struct nullb_device *dev) 
		}

		null_init_queues(nullb);

	} else if (dev->queue_mode == NULL_Q_BIO) {

		nullb->q = blk_alloc_queue_node(GFP_KERNEL, dev->home_node,

						NULL);

		nullb->q = blk_alloc_queue_node(GFP_KERNEL, dev->home_node);

		if (!nullb->q) {

			rv = -ENOMEM;

			goto out_cleanup_queues;

drivers/block/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +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, NULL);

	card->queue = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE);

	if (!card->queue)

		goto failed_alloc;