storvsc: Rather than look for sets of specific protocol versions, make decisions...

Rather than look for sets of specific protocol versions,
make decisions based on ranges. This will be safer and require fewer changes
going forward as we add more storage protocol versions.

Tested-by: Alex Ng <alexng@microsoft.com>
Signed-off-by: Keith Mange <keith.mange@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index dbc9d9a1c89d4eb3fb60293a67d4d223a7ea5ace..05f6f970826ed4a701fd95634f763265ac9a2360 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -981,8 +981,7 @@ static int storvsc_channel_init(struct hv_device *device)
         * support multi-channel.
         */
        max_chns = vstor_packet->storage_channel_properties.max_channel_cnt;
         * support multi-channel.
         */
        max_chns = vstor_packet->storage_channel_properties.max_channel_cnt;

-       if ((vmbus_proto_version != VERSION_WIN7) &&
-          (vmbus_proto_version != VERSION_WS2008))  {
+       if (vmbus_proto_version >= VERSION_WIN8) {

                if (vstor_packet->storage_channel_properties.flags &
                    STORAGE_CHANNEL_SUPPORTS_MULTI_CHANNEL)
                        process_sub_channels = true;
                if (vstor_packet->storage_channel_properties.flags &
                    STORAGE_CHANNEL_SUPPORTS_MULTI_CHANNEL)
                        process_sub_channels = true;


@@ -1759,9 +1758,7 @@ static int storvsc_probe(struct hv_device *device,
         * set state to properly communicate with the host.
         */
 
         * set state to properly communicate with the host.
         */
 

-       switch (vmbus_proto_version) {
-       case VERSION_WS2008:
-       case VERSION_WIN7:
+       if (vmbus_proto_version < VERSION_WIN8) {

                sense_buffer_size = PRE_WIN8_STORVSC_SENSE_BUFFER_SIZE;
                vmscsi_size_delta = sizeof(struct vmscsi_win8_extension);
                vmstor_current_major = VMSTOR_WIN7_MAJOR;
                sense_buffer_size = PRE_WIN8_STORVSC_SENSE_BUFFER_SIZE;
                vmscsi_size_delta = sizeof(struct vmscsi_win8_extension);
                vmstor_current_major = VMSTOR_WIN7_MAJOR;


@@ -1769,8 +1766,7 @@ static int storvsc_probe(struct hv_device *device,
                max_luns_per_target = STORVSC_IDE_MAX_LUNS_PER_TARGET;
                max_targets = STORVSC_IDE_MAX_TARGETS;
                max_channels = STORVSC_IDE_MAX_CHANNELS;
                max_luns_per_target = STORVSC_IDE_MAX_LUNS_PER_TARGET;
                max_targets = STORVSC_IDE_MAX_TARGETS;
                max_channels = STORVSC_IDE_MAX_CHANNELS;

-               break;
-       default:
+       } else {

                sense_buffer_size = POST_WIN7_STORVSC_SENSE_BUFFER_SIZE;
                vmscsi_size_delta = 0;
                vmstor_current_major = VMSTOR_WIN8_MAJOR;
                sense_buffer_size = POST_WIN7_STORVSC_SENSE_BUFFER_SIZE;
                vmscsi_size_delta = 0;
                vmstor_current_major = VMSTOR_WIN8_MAJOR;


@@ -1784,7 +1780,6 @@ static int storvsc_probe(struct hv_device *device,
                 * VCPUs in the guest.
                 */
                max_sub_channels = (num_cpus / storvsc_vcpus_per_sub_channel);
                 * VCPUs in the guest.
                 */
                max_sub_channels = (num_cpus / storvsc_vcpus_per_sub_channel);

-               break;

        }
 
        scsi_driver.can_queue = (max_outstanding_req_per_channel *
        }
 
        scsi_driver.can_queue = (max_outstanding_req_per_channel *