|
@@ -467,6 +467,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
|
|
|
q->backing_dev_info.state = 0;
|
|
|
q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;
|
|
|
q->backing_dev_info.name = "block";
|
|
|
+ q->node = node_id;
|
|
|
|
|
|
err = bdi_init(&q->backing_dev_info);
|
|
|
if (err) {
|
|
@@ -551,7 +552,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
|
|
|
if (!uninit_q)
|
|
|
return NULL;
|
|
|
|
|
|
- q = blk_init_allocated_queue_node(uninit_q, rfn, lock, node_id);
|
|
|
+ q = blk_init_allocated_queue(uninit_q, rfn, lock);
|
|
|
if (!q)
|
|
|
blk_cleanup_queue(uninit_q);
|
|
|
|
|
@@ -562,19 +563,10 @@ EXPORT_SYMBOL(blk_init_queue_node);
|
|
|
struct request_queue *
|
|
|
blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
|
|
|
spinlock_t *lock)
|
|
|
-{
|
|
|
- return blk_init_allocated_queue_node(q, rfn, lock, -1);
|
|
|
-}
|
|
|
-EXPORT_SYMBOL(blk_init_allocated_queue);
|
|
|
-
|
|
|
-struct request_queue *
|
|
|
-blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
|
|
|
- spinlock_t *lock, int node_id)
|
|
|
{
|
|
|
if (!q)
|
|
|
return NULL;
|
|
|
|
|
|
- q->node = node_id;
|
|
|
if (blk_init_free_list(q))
|
|
|
return NULL;
|
|
|
|
|
@@ -604,7 +596,7 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
|
|
|
|
|
|
return NULL;
|
|
|
}
|
|
|
-EXPORT_SYMBOL(blk_init_allocated_queue_node);
|
|
|
+EXPORT_SYMBOL(blk_init_allocated_queue);
|
|
|
|
|
|
int blk_get_queue(struct request_queue *q)
|
|
|
{
|