Staging: hv: Use struct completion in struct storvsc_request_extension

Get rid of the wait_queue mechanism for synchronization in
struct storvsc_request_extension and instead use completion
mechanism.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 5cea33128eda8d53bfe269f5fdaaa50cd3c6e216..8dc17b9349bfc828e2ad9cf209c693b746057d99 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -20,7 +20,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/wait.h>
+#include <linux/completion.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
@@ -107,7 +107,7 @@ static int stor_vsc_channel_init(struct hv_device *device)
        struct storvsc_device *stor_device;
        struct storvsc_request_extension *request;
        struct vstor_packet *vstor_packet;
-       int ret;
+       int ret, t;
 
        stor_device = get_stor_device(device);
        if (!stor_device) {
@@ -124,13 +124,12 @@ static int stor_vsc_channel_init(struct hv_device *device)
         * channel
         */
        memset(request, 0, sizeof(struct storvsc_request_extension));
-       init_waitqueue_head(&request->wait_event);
+       init_completion(&request->wait_event);
        vstor_packet->operation = VSTOR_OPERATION_BEGIN_INITIALIZATION;
        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
 
        DPRINT_INFO(STORVSC, "BEGIN_INITIALIZATION_OPERATION...");
 
-       request->wait_condition = 0;
        ret = vmbus_sendpacket(device->channel, vstor_packet,
                               sizeof(struct vstor_packet),
                               (unsigned long)request,
@@ -142,14 +141,12 @@ static int stor_vsc_channel_init(struct hv_device *device)
                goto cleanup;
        }
 
-       wait_event_timeout(request->wait_event, request->wait_condition,
-                       msecs_to_jiffies(1000));
-       if (request->wait_condition == 0) {
+       t = wait_for_completion_timeout(&request->wait_event, HZ);
+       if (t == 0) {
                ret = -ETIMEDOUT;
                goto cleanup;
        }
 
-
        if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
            vstor_packet->status != 0) {
                DPRINT_ERR(STORVSC, "BEGIN_INITIALIZATION_OPERATION failed "
@@ -168,7 +165,6 @@ static int stor_vsc_channel_init(struct hv_device *device)
        vstor_packet->version.major_minor = VMSTOR_PROTOCOL_VERSION_CURRENT;
        FILL_VMSTOR_REVISION(vstor_packet->version.revision);
 
-       request->wait_condition = 0;
        ret = vmbus_sendpacket(device->channel, vstor_packet,
                               sizeof(struct vstor_packet),
                               (unsigned long)request,
@@ -180,9 +176,8 @@ static int stor_vsc_channel_init(struct hv_device *device)
                goto cleanup;
        }
 
-       wait_event_timeout(request->wait_event, request->wait_condition,
-                       msecs_to_jiffies(1000));
-       if (request->wait_condition == 0) {
+       t = wait_for_completion_timeout(&request->wait_event, HZ);
+       if (t == 0) {
                ret = -ETIMEDOUT;
                goto cleanup;
        }
@@ -205,7 +200,6 @@ static int stor_vsc_channel_init(struct hv_device *device)
        vstor_packet->storage_channel_properties.port_number =
                                        stor_device->port_number;
 
-       request->wait_condition = 0;
        ret = vmbus_sendpacket(device->channel, vstor_packet,
                               sizeof(struct vstor_packet),
                               (unsigned long)request,
@@ -218,9 +212,8 @@ static int stor_vsc_channel_init(struct hv_device *device)
                goto cleanup;
        }
 
-       wait_event_timeout(request->wait_event, request->wait_condition,
-                       msecs_to_jiffies(1000));
-       if (request->wait_condition == 0) {
+       t = wait_for_completion_timeout(&request->wait_event, HZ);
+       if (t == 0) {
                ret = -ETIMEDOUT;
                goto cleanup;
        }
@@ -248,7 +241,6 @@ static int stor_vsc_channel_init(struct hv_device *device)
        vstor_packet->operation = VSTOR_OPERATION_END_INITIALIZATION;
        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
 
-       request->wait_condition = 0;
        ret = vmbus_sendpacket(device->channel, vstor_packet,
                               sizeof(struct vstor_packet),
                               (unsigned long)request,
@@ -261,9 +253,8 @@ static int stor_vsc_channel_init(struct hv_device *device)
                goto cleanup;
        }
 
-       wait_event_timeout(request->wait_event, request->wait_condition,
-                       msecs_to_jiffies(1000));
-       if (request->wait_condition == 0) {
+       t = wait_for_completion_timeout(&request->wait_event, HZ);
+       if (t == 0) {
                ret = -ETIMEDOUT;
                goto cleanup;
        }
@@ -397,8 +388,7 @@ static void stor_vsc_on_channel_callback(void *context)
 
                                memcpy(&request->vstor_packet, packet,
                                       sizeof(struct vstor_packet));
-                               request->wait_condition = 1;
-                               wake_up(&request->wait_event);
+                               complete(&request->wait_event);
                        } else {
                                stor_vsc_on_receive(device,
                                                (struct vstor_packet *)packet,

diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 5c80cdb5dc1afec3155ef2341fadb953c636abb1..cdef1c7d650fb3ff6cfea33dc08f71391c3b6a43 100644 (file)
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -60,8 +60,7 @@ struct storvsc_request_extension {
        struct hv_device *device;
 
        /* Synchronize the request/response if needed */
-       int wait_condition;
-       wait_queue_head_t wait_event;
+       struct completion wait_event;
 
        struct vstor_packet vstor_packet;
 };

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 268c60707ebeebe9b0d57071732d079b3adfb75a..c2a3a5b8fd0fcae9417a9591d88fb76f0e2b69f9 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -231,7 +231,7 @@ static int stor_vsc_on_host_reset(struct hv_device *device)
        struct storvsc_device *stor_device;
        struct storvsc_request_extension *request;
        struct vstor_packet *vstor_packet;
-       int ret;
+       int ret, t;
 
        DPRINT_INFO(STORVSC, "resetting host adapter...");
 
@@ -245,13 +245,12 @@ static int stor_vsc_on_host_reset(struct hv_device *device)
        request = &stor_device->reset_request;
        vstor_packet = &request->vstor_packet;
 
-       init_waitqueue_head(&request->wait_event);
+       init_completion(&request->wait_event);
 
        vstor_packet->operation = VSTOR_OPERATION_RESET_BUS;
        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
        vstor_packet->vm_srb.path_id = stor_device->path_id;
 
-       request->wait_condition = 0;
        ret = vmbus_sendpacket(device->channel, vstor_packet,
                               sizeof(struct vstor_packet),
                               (unsigned long)&stor_device->reset_request,
@@ -263,9 +262,8 @@ static int stor_vsc_on_host_reset(struct hv_device *device)
                goto cleanup;
        }
 
-       wait_event_timeout(request->wait_event, request->wait_condition,
-                       msecs_to_jiffies(1000));
-       if (request->wait_condition == 0) {
+       t = wait_for_completion_timeout(&request->wait_event, HZ);
+       if (t == 0) {
                ret = -ETIMEDOUT;
                goto cleanup;
        }