Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 248935
b: refs/heads/master
c: 9395846
h: refs/heads/master
i:
  248933: 4976cbd
  248931: fb6dc30
  248927: c84c48c
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent ee7b6ad commit 898ffed
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ced01b0df71fb184744c473b934f9ea70454b750
refs/heads/master: 93958465598f22833ee21f9aa3d79749acb7d6eb
34 changes: 12 additions & 22 deletions trunk/drivers/staging/hv/storvsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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) {
Expand All @@ -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,
Expand All @@ -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 "
Expand All @@ -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,
Expand All @@ -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;
}
Expand All @@ -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,
Expand All @@ -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;
}
Expand Down Expand Up @@ -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,
Expand All @@ -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;
}
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/hv/storvsc_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
10 changes: 4 additions & 6 deletions trunk/drivers/staging/hv/storvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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...");

Expand All @@ -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,
Expand All @@ -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;
}
Expand Down

0 comments on commit 898ffed

Please sign in to comment.