Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249560
b: refs/heads/master
c: b004386
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 11, 2011
1 parent 8d7e717 commit a1494ef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4b599df0ca8c8d4d8530fe2ecb08dd6af56e2c7b
refs/heads/master: b0043863a0097c3ebe59f91a91fc25d8e1e575e8
20 changes: 10 additions & 10 deletions trunk/drivers/staging/hv/connection.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int vmbus_connect(void)
vmbus_connection.work_queue = create_workqueue("hv_vmbus_con");
if (!vmbus_connection.work_queue) {
ret = -1;
goto Cleanup;
goto cleanup;
}

INIT_LIST_HEAD(&vmbus_connection.chn_msg_list);
Expand All @@ -75,7 +75,7 @@ int vmbus_connect(void)
(void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, 0);
if (vmbus_connection.int_page == NULL) {
ret = -1;
goto Cleanup;
goto cleanup;
}

vmbus_connection.recv_int_page = vmbus_connection.int_page;
Expand All @@ -91,15 +91,15 @@ int vmbus_connect(void)
(void *)__get_free_pages((GFP_KERNEL|__GFP_ZERO), 1);
if (vmbus_connection.monitor_pages == NULL) {
ret = -1;
goto Cleanup;
goto cleanup;
}

msginfo = kzalloc(sizeof(*msginfo) +
sizeof(struct vmbus_channel_initiate_contact),
GFP_KERNEL);
if (msginfo == NULL) {
ret = -ENOMEM;
goto Cleanup;
goto cleanup;
}

init_completion(&msginfo->waitevent);
Expand Down Expand Up @@ -131,7 +131,7 @@ int vmbus_connect(void)
list_del(&msginfo->msglistentry);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock,
flags);
goto Cleanup;
goto cleanup;
}

/* Wait for the connection response */
Expand All @@ -143,7 +143,7 @@ int vmbus_connect(void)
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock,
flags);
ret = -ETIMEDOUT;
goto Cleanup;
goto cleanup;
}

spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
Expand All @@ -158,13 +158,13 @@ int vmbus_connect(void)
"Version %d not supported by Hyper-V\n",
VMBUS_REVISION_NUMBER);
ret = -1;
goto Cleanup;
goto cleanup;
}

kfree(msginfo);
return 0;

Cleanup:
cleanup:
vmbus_connection.conn_state = DISCONNECTED;

if (vmbus_connection.work_queue)
Expand Down Expand Up @@ -207,7 +207,7 @@ int vmbus_disconnect(void)
ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_message_header));
if (ret != 0)
goto Cleanup;
goto cleanup;

free_pages((unsigned long)vmbus_connection.int_page, 0);
free_pages((unsigned long)vmbus_connection.monitor_pages, 1);
Expand All @@ -219,7 +219,7 @@ int vmbus_disconnect(void)

pr_info("hv_vmbus disconnected\n");

Cleanup:
cleanup:
kfree(msg);
return ret;
}
Expand Down

0 comments on commit a1494ef

Please sign in to comment.