mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-02 08:20:06 +00:00
566bb2a1f0
This also adds the cherry-picked commit f1c635b439a5c017 ("scsi: storvsc: Workaround
for virtual DVD SCSI version") from 4.11 for the 4.9 and 4.10 kernels. This commit
fixes a crash/memory leak on Hyper-V when no disk drives are attached and if one
boots of a CD-ROM drive.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From d3389a4bb44b67606dbd2a52443e6dee1f41903c Mon Sep 17 00:00:00 2001
|
|
From: Dexuan Cui <decui@microsoft.com>
|
|
Date: Wed, 27 Jan 2016 22:29:37 -0800
|
|
Subject: [PATCH 26/44] Drivers: hv: vmbus: add a helper function to set a
|
|
channel's pending send size
|
|
|
|
This will be used by the coming net/hvsock driver.
|
|
|
|
Signed-off-by: Dexuan Cui <decui@microsoft.com>
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit 3c75354d043ad546148d6992e40033ecaefc5ea5)
|
|
---
|
|
include/linux/hyperv.h | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
|
|
index 51c98fd6044d..934542ac1394 100644
|
|
--- a/include/linux/hyperv.h
|
|
+++ b/include/linux/hyperv.h
|
|
@@ -818,6 +818,12 @@ static inline void *get_per_channel_state(struct vmbus_channel *c)
|
|
return c->per_channel_state;
|
|
}
|
|
|
|
+static inline void set_channel_pending_send_size(struct vmbus_channel *c,
|
|
+ u32 size)
|
|
+{
|
|
+ c->outbound.ring_buffer->pending_send_sz = size;
|
|
+}
|
|
+
|
|
void vmbus_onmessage(void *context);
|
|
|
|
int vmbus_request_offers(void);
|
|
--
|
|
2.11.0
|
|
|