OSDN Git Service

s390/dasd: correct numa_node in dasd_alloc_queue
authorVasily Gorbik <gor@linux.ibm.com>
Sun, 24 Jun 2018 07:21:59 +0000 (09:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Oct 2018 23:59:09 +0000 (16:59 -0700)
[ Upstream commit b17e3abb0af404cb62ad4ef1a5962f58b06e2b78 ]

The numa_node field of the tag_set struct has to be explicitly
initialized, otherwise it stays as 0, which is a valid numa node id and
cause memory allocation failure if node 0 is offline.

Acked-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/s390/block/dasd.c

index a9f60d0..7c73241 100644 (file)
@@ -3127,6 +3127,7 @@ static int dasd_alloc_queue(struct dasd_block *block)
        block->tag_set.nr_hw_queues = nr_hw_queues;
        block->tag_set.queue_depth = queue_depth;
        block->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
+       block->tag_set.numa_node = NUMA_NO_NODE;
 
        rc = blk_mq_alloc_tag_set(&block->tag_set);
        if (rc)