| From 72c6b71c245dac8f371167d97ef471b367d0b66b Mon Sep 17 00:00:00 2001 |
| From: "K. Y. Srinivasan" <kys@microsoft.com> |
| Date: Wed, 27 Aug 2014 16:25:34 -0700 |
| Subject: Drivers: hv: vmbus: Cleanup vmbus_establish_gpadl() |
| |
| From: "K. Y. Srinivasan" <kys@microsoft.com> |
| |
| commit 72c6b71c245dac8f371167d97ef471b367d0b66b upstream. |
| |
| Eliminate the call to BUG_ON() by waiting for the host to respond. We are |
| trying to reclaim the ownership of memory that was given to the host and so |
| we will have to wait until the host responds. |
| |
| Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> |
| Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hv/channel.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| --- a/drivers/hv/channel.c |
| +++ b/drivers/hv/channel.c |
| @@ -363,7 +363,6 @@ int vmbus_establish_gpadl(struct vmbus_c |
| u32 next_gpadl_handle; |
| unsigned long flags; |
| int ret = 0; |
| - int t; |
| |
| next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle); |
| atomic_inc(&vmbus_connection.next_gpadl_handle); |
| @@ -410,9 +409,7 @@ int vmbus_establish_gpadl(struct vmbus_c |
| |
| } |
| } |
| - t = wait_for_completion_timeout(&msginfo->waitevent, 5*HZ); |
| - BUG_ON(t == 0); |
| - |
| + wait_for_completion(&msginfo->waitevent); |
| |
| /* At this point, we received the gpadl created msg */ |
| *gpadl_handle = gpadlmsg->gpadl; |
