Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755264AbbBBJoh (ORCPT ); Mon, 2 Feb 2015 04:44:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59020 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753230AbbBBJog (ORCPT ); Mon, 2 Feb 2015 04:44:36 -0500 Date: Mon, 02 Feb 2015 09:52:04 +0008 From: Jason Wang Subject: Re: [PATCH v2 3/3] hv: vmbus_open(): reset the channel state on ENOMEM To: Dexuan Cui Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, driverdev-devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, kys@microsoft.com, vkuznets@redhat.com, haiyangz@microsoft.com Message-Id: <1422870244.7028.7@smtp.corp.redhat.com> In-Reply-To: <1422851820-2432-1-git-send-email-decui@microsoft.com> References: <1422851820-2432-1-git-send-email-decui@microsoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1595 Lines: 55 On Mon, Feb 2, 2015 at 12:37 PM, Dexuan Cui wrote: > Without this patch, the state is put to CHANNEL_OPENING_STATE, and > when > the driver is loaded next time, vmbus_open() will fail immediately > due to > newchannel->state != CHANNEL_OPEN_STATE. > > CC: "K. Y. Srinivasan" > Signed-off-by: Dexuan Cui > --- > > v2: this is a RESEND. > > drivers/hv/channel.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c > index 2978f5e..26dcf26 100644 > --- a/drivers/hv/channel.c > +++ b/drivers/hv/channel.c > @@ -89,9 +89,10 @@ int vmbus_open(struct vmbus_channel *newchannel, > u32 send_ringbuffer_size, > out = (void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, > get_order(send_ringbuffer_size + recv_ringbuffer_size)); > > - if (!out) > - return -ENOMEM; > - > + if (!out) { > + err = -ENOMEM; > + goto error0; > + } > > in = (void *)((unsigned long)out + send_ringbuffer_size); > > @@ -199,6 +200,7 @@ error0: > free_pages((unsigned long)out, > get_order(send_ringbuffer_size + recv_ringbuffer_size)); > kfree(open_info); > + newchannel->state = CHANNEL_OPEN_STATE; > return err; > } > EXPORT_SYMBOL_GPL(vmbus_open); > -- > 1.9.1 Reviewed-by: Jason Wang -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/