3.2.65-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: "K. Y. Srinivasan" <k...@microsoft.com> commit 98d731bb064a9d1817a6ca9bf8b97051334a7cfe upstream. Eliminate calls to BUG_ON() in vmbus_close_internal(). We have chosen to potentially leak memory, than crash the guest in case of failures. In this version of the patch I have addressed comments from Dan Carpenter (dan.carpen...@oracle.com). Signed-off-by: K. Y. Srinivasan <k...@microsoft.com> Tested-by: Sitsofe Wheeler <sits...@yahoo.com> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> [bwh: Backported to 3.2: function is extern; don't change the return type to int as callers will ignore the value] Signed-off-by: Ben Hutchings <b...@decadent.org.uk> --- drivers/hv/channel.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -531,11 +531,28 @@ void vmbus_close(struct vmbus_channel *c ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_close_channel)); - BUG_ON(ret != 0); + if (ret) { + pr_err("Close failed: close post msg return is %d\n", ret); + /* + * If we failed to post the close msg, + * it is perhaps better to leak memory. + */ + return; + } + /* Tear down the gpadl for the channel's ring buffer */ - if (channel->ringbuffer_gpadlhandle) - vmbus_teardown_gpadl(channel, - channel->ringbuffer_gpadlhandle); + if (channel->ringbuffer_gpadlhandle) { + ret = vmbus_teardown_gpadl(channel, + channel->ringbuffer_gpadlhandle); + if (ret) { + pr_err("Close failed: teardown gpadl return %d\n", ret); + /* + * If we failed to teardown gpadl, + * it is perhaps better to leak memory. + */ + return; + } + } /* Cleanup the ring buffers for this channel */ hv_ringbuffer_cleanup(&channel->outbound); -- 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/