Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6c4bc66 authored by Keith Mange's avatar Keith Mange Committed by James Bottomley
Browse files

storvsc: use storage protocol version to determine storage capabilities 



Use storage protocol version instead of vmbus protocol
version when determining storage capabilities.

Tested-by: default avatarAlex Ng <alexng@microsoft.com>
Signed-off-by: default avatarKeith Mange <keith.mange@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent cb11fead

drivers/scsi/storvsc_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ static int storvsc_channel_init(struct hv_device *device) 
	 * support multi-channel.

	 */

	max_chns = vstor_packet->storage_channel_properties.max_channel_cnt;

	if (vmbus_proto_version >= VERSION_WIN8) {

	if (vmstor_proto_version >= VMSTOR_PROTO_VERSION_WIN8) {

		if (vstor_packet->storage_channel_properties.flags &

		    STORAGE_CHANNEL_SUPPORTS_MULTI_CHANNEL)

			process_sub_channels = true;
@@ -1483,9 +1483,9 @@ static int storvsc_device_configure(struct scsi_device *sdevice) 
	 * if the device is a MSFT virtual device.

	 */

	if (!strncmp(sdevice->vendor, "Msft", 4)) {

		switch (vmbus_proto_version) {

		case VERSION_WIN8:

		case VERSION_WIN8_1:

		switch (vmstor_proto_version) {

		case VMSTOR_PROTO_VERSION_WIN8:

		case VMSTOR_PROTO_VERSION_WIN8_1:

			sdevice->scsi_level = SCSI_SPC_3;

			break;

		}