From: Vasily Gorbik <gor@linux.ibm.com>

Date: Mon, 25 Jun 2018 14:30:42 +0200

Subject: s390/scm_blk: correct numa_node in scm_blk_dev_setup

Git-commit: d642d6262f4fcfa5d200ec6e218c17f0c15b3390

Patch-mainline: v4.19-rc1

References: git-fixes bsc#1211365

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: Sebastian Ott <sebott@linux.ibm.com>

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Acked-by: Miroslav Franc <mfranc@suse.cz>

---

 drivers/s390/block/scm_blk.c | 1 +

 1 file changed, 1 insertion(+)

diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c

index b1fcb76dd272..98f66b7b6794 100644

--- a/drivers/s390/block/scm_blk.c

+++ b/drivers/s390/block/scm_blk.c

@@ -455,6 +455,7 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)

 	bdev->tag_set.nr_hw_queues = nr_requests;

 	bdev->tag_set.queue_depth = nr_requests_per_io * nr_requests;

 	bdev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;

+	bdev->tag_set.numa_node = NUMA_NO_NODE;

 	ret = blk_mq_alloc_tag_set(&bdev->tag_set);

 	if (ret)