From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 3 Apr 2018 17:39:19 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.103~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caebe1bf449374dce0666522667bcec28d06fb13;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	scsi-virtio_scsi-always-read-vpd-pages-for-multiqueue-too.patch
---

diff --git a/queue-3.18/scsi-virtio_scsi-always-read-vpd-pages-for-multiqueue-too.patch b/queue-3.18/scsi-virtio_scsi-always-read-vpd-pages-for-multiqueue-too.patch
new file mode 100644
index 00000000000..f0490669673
--- /dev/null
+++ b/queue-3.18/scsi-virtio_scsi-always-read-vpd-pages-for-multiqueue-too.patch
@@ -0,0 +1,36 @@
+From a680f1d463aeaeb00d22af257a56e111967c2f18 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Wed, 5 Jul 2017 10:30:56 +0200
+Subject: scsi: virtio_scsi: always read VPD pages for multiqueue too
+
+From: Paolo Bonzini <pbonzini@redhat.com>
+
+commit a680f1d463aeaeb00d22af257a56e111967c2f18 upstream.
+
+Multi-queue virtio-scsi uses a different scsi_host_template struct.  Add
+the .device_alloc field there, too.
+
+Fixes: 25d1d50e23275e141e3a3fe06c25a99f4c4bf4e0
+Cc: stable@vger.kernel.org
+Cc: David Gibson <david@gibson.dropbear.id.au>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Fam Zheng <famz@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/virtio_scsi.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/scsi/virtio_scsi.c
++++ b/drivers/scsi/virtio_scsi.c
+@@ -794,6 +794,7 @@ static struct scsi_host_template virtscs
+ 	.change_queue_depth = virtscsi_change_queue_depth,
+ 	.eh_abort_handler = virtscsi_abort,
+ 	.eh_device_reset_handler = virtscsi_device_reset,
++	.slave_alloc = virtscsi_device_alloc,
+ 
+ 	.can_queue = 1024,
+ 	.dma_boundary = UINT_MAX,
diff --git a/queue-3.18/series b/queue-3.18/series
index 14739a3a13c..e056ffd280c 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -53,3 +53,4 @@ xfrm-refuse-to-insert-32-bit-userspace-socket-policies-on-64-bit-systems.patch
 netfilter-bridge-ebt_among-add-more-missing-match-size-checks.patch
 netfilter-x_tables-add-and-use-xt_check_proc_name.patch
 bluetooth-fix-missing-encryption-refresh-on-security-request.patch
+scsi-virtio_scsi-always-read-vpd-pages-for-multiqueue-too.patch