Commit ac0d12b7 authored Feb 27, 2015 by Dexuan Cui Committed by Greg Kroah-Hartman Mar 01, 2015

hv: vmbus_open(): reset the channel state on ENOMEM



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" <kys@microsoft.com>
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 89f9f679

drivers/hv/channel.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message