|
@@ -119,7 +119,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
|
|
|
void (*onchannelcallback)(void *context), void *context)
|
|
|
{
|
|
|
struct vmbus_channel_open_channel *open_msg;
|
|
|
- struct vmbus_channel_msginfo *openInfo = NULL;
|
|
|
+ struct vmbus_channel_msginfo *open_info = NULL;
|
|
|
void *in, *out;
|
|
|
unsigned long flags;
|
|
|
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 */
|
|
|
- openInfo = kmalloc(sizeof(*openInfo) +
|
|
|
+ open_info = kmalloc(sizeof(*open_info) +
|
|
|
sizeof(struct vmbus_channel_open_channel),
|
|
|
GFP_KERNEL);
|
|
|
- if (!openInfo) {
|
|
|
+ if (!open_info) {
|
|
|
err = -ENOMEM;
|
|
|
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->openid = 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);
|
|
|
|
|
|
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
|
|
|
- list_add_tail(&openInfo->msglistentry,
|
|
|
+ list_add_tail(&open_info->msglistentry,
|
|
|
&vmbus_connection.chn_msg_list);
|
|
|
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)
|
|
|
goto cleanup;
|
|
|
|
|
|
- t = wait_for_completion_timeout(&openInfo->waitevent, 5*HZ);
|
|
|
+ t = wait_for_completion_timeout(&open_info->waitevent, 5*HZ);
|
|
|
if (t == 0) {
|
|
|
err = -ETIMEDOUT;
|
|
|
goto errorout;
|
|
|
}
|
|
|
|
|
|
|
|
|
- if (openInfo->response.open_result.status)
|
|
|
- err = openInfo->response.open_result.status;
|
|
|
+ if (open_info->response.open_result.status)
|
|
|
+ err = open_info->response.open_result.status;
|
|
|
|
|
|
cleanup:
|
|
|
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);
|
|
|
|
|
|
- kfree(openInfo);
|
|
|
+ kfree(open_info);
|
|
|
return err;
|
|
|
|
|
|
errorout:
|
|
@@ -233,7 +233,7 @@ errorout:
|
|
|
hv_ringbuffer_cleanup(&newchannel->inbound);
|
|
|
free_pages((unsigned long)out,
|
|
|
get_order(send_ringbuffer_size + recv_ringbuffer_size));
|
|
|
- kfree(openInfo);
|
|
|
+ kfree(open_info);
|
|
|
return err;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(vmbus_open);
|