[PATCH 1/1] Drivers: hv: vmbus: Fix a bug in rescind processing in vmbus_close_internal()

[K. Y. Srinivasan]

When a channel has been rescinded, the close operation is a noop.
Restructure the code so we deal with the rescind condition after
we properly cleanup the channel. I would like to thank 
Dexuan Cui  for observing this problem.
The current code leaks memory when the channel is rescinded.

Signed-off-by: K. Y. Srinivasan 
---
 drivers/hv/channel.c |   15 ++-
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index e58cdb7..fddd3b5 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -501,15 +501,6 @@ static int vmbus_close_internal(struct vmbus_channel 
*channel)
put_cpu();
}
 
-   /*
-* If the channel has been rescinded; process device removal.
-*/
-   if (channel->rescind) {
-   hv_process_channel_removal(channel,
-  channel->offermsg.child_relid);
-   return 0;
-   }
-
/* Send a closing message */
 
msg = >close_msg.msg;
@@ -549,6 +540,12 @@ static int vmbus_close_internal(struct vmbus_channel 
*channel)
free_pages((unsigned long)channel->ringbuffer_pages,
get_order(channel->ringbuffer_pagecount * PAGE_SIZE));
 
+   /*
+* If the channel has been rescinded; process device removal.
+*/
+   if (channel->rescind)
+   hv_process_channel_removal(channel,
+  channel->offermsg.child_relid);
return ret;
 }
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/1] Drivers: hv: vmbus: Fix a bug in rescind processing in vmbus_close_internal()

[K. Y. Srinivasan]

When a channel has been rescinded, the close operation is a noop.
Restructure the code so we deal with the rescind condition after
we properly cleanup the channel. I would like to thank 
Dexuan Cui de...@microsoft.com for observing this problem.
The current code leaks memory when the channel is rescinded.

Signed-off-by: K. Y. Srinivasan k...@microsoft.com
---
 drivers/hv/channel.c |   15 ++-
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index e58cdb7..fddd3b5 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -501,15 +501,6 @@ static int vmbus_close_internal(struct vmbus_channel 
*channel)
put_cpu();
}
 
-   /*
-* If the channel has been rescinded; process device removal.
-*/
-   if (channel-rescind) {
-   hv_process_channel_removal(channel,
-  channel-offermsg.child_relid);
-   return 0;
-   }
-
/* Send a closing message */
 
msg = channel-close_msg.msg;
@@ -549,6 +540,12 @@ static int vmbus_close_internal(struct vmbus_channel 
*channel)
free_pages((unsigned long)channel-ringbuffer_pages,
get_order(channel-ringbuffer_pagecount * PAGE_SIZE));
 
+   /*
+* If the channel has been rescinded; process device removal.
+*/
+   if (channel-rescind)
+   hv_process_channel_removal(channel,
+  channel-offermsg.child_relid);
return ret;
 }
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/