block: use NUMA_NO_NODE instead of -1

Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Modified by me to cover blk_init_queue() as well.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 3c95c4d6e31afe057ebabeda36868682e8188329..ee0e5cafa85954e036234ffda5ed747428d05c89 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -549,7 +549,7 @@ void blk_exit_rl(struct request_list *rl)
 
 struct request_queue *blk_alloc_queue(gfp_t gfp_mask)
 {
-       return blk_alloc_queue_node(gfp_mask, -1);
+       return blk_alloc_queue_node(gfp_mask, NUMA_NO_NODE);
 }
 EXPORT_SYMBOL(blk_alloc_queue);
 
@@ -660,7 +660,7 @@ EXPORT_SYMBOL(blk_alloc_queue_node);
 
 struct request_queue *blk_init_queue(request_fn_proc *rfn, spinlock_t *lock)
 {
-       return blk_init_queue_node(rfn, lock, -1);
+       return blk_init_queue_node(rfn, lock, NUMA_NO_NODE);
 }
 EXPORT_SYMBOL(blk_init_queue);
 

diff --git a/block/genhd.c b/block/genhd.c
index 6cace663a80e4a89492f8b656f580a944b134f9d..2a6fdf539a6969d952cddf865f00d7a225d5ea23 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1245,7 +1245,7 @@ EXPORT_SYMBOL(blk_lookup_devt);
 
 struct gendisk *alloc_disk(int minors)
 {
-       return alloc_disk_node(minors, -1);
+       return alloc_disk_node(minors, NUMA_NO_NODE);
 }
 EXPORT_SYMBOL(alloc_disk);