summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-06-25 14:30:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-03 17:00:49 -0700
commit33cd135ebc97e44140f76f625b9b3d99fd8019cb (patch)
tree88209f72bd4f3634e334e998f96610a3db86ef27 /drivers/s390
parent98a34e26d93db505afe2fe0e26f47d755c85d40a (diff)
downloadlinux-stable-33cd135ebc97e44140f76f625b9b3d99fd8019cb.tar.gz
linux-stable-33cd135ebc97e44140f76f625b9b3d99fd8019cb.tar.bz2
linux-stable-33cd135ebc97e44140f76f625b9b3d99fd8019cb.zip
s390/scm_blk: correct numa_node in scm_blk_dev_setup
[ Upstream commit d642d6262f4fcfa5d200ec6e218c17f0c15b3390 ] 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> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/scm_blk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index eb51893c74a4..5c944ee76ec1 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -454,6 +454,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)