projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 94bcd1f7 GKH |
1 | From 72c6b71c245dac8f371167d97ef471b367d0b66b Mon Sep 17 00:00:00 2001 |
| 2 | From: "K. Y. Srinivasan" <kys@microsoft.com> | |
| 3 | Date: Wed, 27 Aug 2014 16:25:34 -0700 | |
| 4 | Subject: Drivers: hv: vmbus: Cleanup vmbus_establish_gpadl() | |
| 5 | ||
| 6 | From: "K. Y. Srinivasan" <kys@microsoft.com> | |
| 7 | ||
| 8 | commit 72c6b71c245dac8f371167d97ef471b367d0b66b upstream. | |
| 9 | ||
| 10 | Eliminate the call to BUG_ON() by waiting for the host to respond. We are | |
| 11 | trying to reclaim the ownership of memory that was given to the host and so | |
| 12 | we will have to wait until the host responds. | |
| 13 | ||
| 14 | Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> | |
| 15 | Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com> | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 17 | ||
| 18 | --- | |
| 19 | drivers/hv/channel.c | 5 +---- | |
| 20 | 1 file changed, 1 insertion(+), 4 deletions(-) | |
| 21 | ||
| 22 | --- a/drivers/hv/channel.c | |
| 23 | +++ b/drivers/hv/channel.c | |
| 24 | @@ -363,7 +363,6 @@ int vmbus_establish_gpadl(struct vmbus_c | |
| 25 | u32 next_gpadl_handle; | |
| 26 | unsigned long flags; | |
| 27 | int ret = 0; | |
| 28 | - int t; | |
| 29 | ||
| 30 | next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle); | |
| 31 | atomic_inc(&vmbus_connection.next_gpadl_handle); | |
| 32 | @@ -410,9 +409,7 @@ int vmbus_establish_gpadl(struct vmbus_c | |
| 33 | ||
| 34 | } | |
| 35 | } | |
| 36 | - t = wait_for_completion_timeout(&msginfo->waitevent, 5*HZ); | |
| 37 | - BUG_ON(t == 0); | |
| 38 | - | |
| 39 | + wait_for_completion(&msginfo->waitevent); | |
| 40 | ||
| 41 | /* At this point, we received the gpadl created msg */ | |
| 42 | *gpadl_handle = gpadlmsg->gpadl; |