mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-02 16:07:13 +00:00
d0e55af229
The patches from 4.12 applied cleanly, except for 81304747d9
("Drivers: hv: vmbus: Fix rescind handling"), which was already
in upstream so has been dropped from the patch series.
The kernel config is from 4.12 run through defconfig/oldconfig to
pick up any new defaults.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
From 93ac962f7611de9759ff2f0697ca40725aa979f8 Mon Sep 17 00:00:00 2001
|
|
From: Dexuan Cui <decui@microsoft.com>
|
|
Date: Fri, 5 May 2017 16:57:20 -0600
|
|
Subject: [PATCH 02/17] vmbus: remove "goto error_clean_msglist" in
|
|
vmbus_open()
|
|
|
|
This is just a cleanup patch to simplify the code a little.
|
|
No semantic change.
|
|
|
|
Signed-off-by: Dexuan Cui <decui@microsoft.com>
|
|
Cc: K. Y. Srinivasan <kys@microsoft.com>
|
|
Cc: Haiyang Zhang <haiyangz@microsoft.com>
|
|
Cc: Stephen Hemminger <sthemmin@microsoft.com>
|
|
Origin: git@github.com:dcui/linux.git
|
|
(cherry picked from commit 866488f04fc4d8ff513697db2f80263e90277291)
|
|
---
|
|
drivers/hv/channel.c | 18 +++++++-----------
|
|
1 file changed, 7 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
|
index 6e172cdf42f7..42498ecd0f02 100644
|
|
--- a/drivers/hv/channel.c
|
|
+++ b/drivers/hv/channel.c
|
|
@@ -180,17 +180,18 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
|
|
ret = vmbus_post_msg(open_msg,
|
|
sizeof(struct vmbus_channel_open_channel), true);
|
|
|
|
- if (ret != 0) {
|
|
- err = ret;
|
|
- goto error_clean_msglist;
|
|
- }
|
|
-
|
|
- wait_for_completion(&open_info->waitevent);
|
|
+ if (ret == 0)
|
|
+ wait_for_completion(&open_info->waitevent);
|
|
|
|
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
|
|
list_del(&open_info->msglistentry);
|
|
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
|
|
|
|
+ if (ret != 0) {
|
|
+ err = ret;
|
|
+ goto error_free_gpadl;
|
|
+ }
|
|
+
|
|
if (newchannel->rescind) {
|
|
err = -ENODEV;
|
|
goto error_free_gpadl;
|
|
@@ -205,11 +206,6 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
|
|
kfree(open_info);
|
|
return 0;
|
|
|
|
-error_clean_msglist:
|
|
- spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
|
|
- list_del(&open_info->msglistentry);
|
|
- spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
|
|
-
|
|
error_free_gpadl:
|
|
vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle);
|
|
kfree(open_info);
|
|
--
|
|
2.14.1
|
|
|