mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-07 11:28:32 +00:00
Code Issues Releases Wiki Activity

Staging: hv: vmbus: Change the variable name openInfo to open_info in channel.c

Browse source 
Change the variable name openInfo to open_info in channel.c.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-08-25 09:48:57 -07:00 committed by Greg Kroah-Hartman
parent c8a56985fa
commit 176fb9e3f1
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/staging/hv/channel.c
View file

@ -119,7 +119,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
void (*onchannelcallback)(void *context), void *context) void (*onchannelcallback)(void *context), void *context)
{ {
struct vmbus_channel_open_channel *open_msg; struct vmbus_channel_open_channel *open_msg;
struct vmbus_channel_msginfo *openInfo = NULL; struct vmbus_channel_msginfo *open_info = NULL;
void *in, *out; void *in, *out;
unsigned long flags; unsigned long flags;
int ret, t, err = 0; int ret, t, err = 0;
@ -172,17 +172,17 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
} }
/* Create and init the channel open message */ /* Create and init the channel open message */
openInfo = kmalloc(sizeof(*openInfo) + open_info = kmalloc(sizeof(*open_info) +
sizeof(struct vmbus_channel_open_channel), sizeof(struct vmbus_channel_open_channel),
GFP_KERNEL); GFP_KERNEL);
if (!openInfo) { if (!open_info) {
err = -ENOMEM; err = -ENOMEM;
goto errorout; goto errorout;
} }
init_completion(&openInfo->waitevent); init_completion(&open_info->waitevent);
open_msg = (struct vmbus_channel_open_channel *)openInfo->msg; open_msg = (struct vmbus_channel_open_channel *)open_info->msg;
open_msg->header.msgtype = CHANNELMSG_OPENCHANNEL; open_msg->header.msgtype = CHANNELMSG_OPENCHANNEL;
open_msg->openid = newchannel->offermsg.child_relid; open_msg->openid = newchannel->offermsg.child_relid;
open_msg->child_relid = newchannel->offermsg.child_relid; open_msg->child_relid = newchannel->offermsg.child_relid;
@ -200,7 +200,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
memcpy(open_msg->userdata, userdata, userdatalen); memcpy(open_msg->userdata, userdata, userdatalen);
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
list_add_tail(&openInfo->msglistentry, list_add_tail(&open_info->msglistentry,
&vmbus_connection.chn_msg_list); &vmbus_connection.chn_msg_list);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
@ -210,22 +210,22 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
if (ret != 0) if (ret != 0)
goto cleanup; goto cleanup;
t = wait_for_completion_timeout(&openInfo->waitevent, 5*HZ); t = wait_for_completion_timeout(&open_info->waitevent, 5*HZ);
if (t == 0) { if (t == 0) {
err = -ETIMEDOUT; err = -ETIMEDOUT;
goto errorout; goto errorout;
} }
if (openInfo->response.open_result.status) if (open_info->response.open_result.status)
err = openInfo->response.open_result.status; err = open_info->response.open_result.status;
cleanup: cleanup:
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
list_del(&openInfo->msglistentry); list_del(&open_info->msglistentry);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
kfree(openInfo); kfree(open_info);
return err; return err;
errorout: errorout:
@ -233,7 +233,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
hv_ringbuffer_cleanup(&newchannel->inbound); hv_ringbuffer_cleanup(&newchannel->inbound);
free_pages((unsigned long)out, free_pages((unsigned long)out,
get_order(send_ringbuffer_size + recv_ringbuffer_size)); get_order(send_ringbuffer_size + recv_ringbuffer_size));
kfree(openInfo); kfree(open_info);
return err; return err;
} }
EXPORT_SYMBOL_GPL(vmbus_open); EXPORT_SYMBOL_GPL(vmbus_open);