Commit 31d4ea1a authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman

Drivers: hv: util: make struct hv_do_fcopy match Hyper-V host messages

An attempt to fix fcopy on i586 (bc5a5b02 Drivers: hv: util: Properly pack the data
for file copy functionality) led to a regression on x86_64 (and actually didn't fix
i586 breakage). Fcopy messages from Hyper-V host come in the following format:

struct do_fcopy_hdr   |   36 bytes
0000                  |    4 bytes
offset                |    8 bytes
size                  |    4 bytes
data                  | 6144 bytes

On x86_64 struct hv_do_fcopy matched this format without ' __attribute__((packed))'
and on i586 adding ' __attribute__((packed))' to it doesn't change anything. Keep
the structure packed and add padding to match re reality. Tested both i586 and x86_64
on Hyper-V Server 2012 R2.
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 170f4bea
...@@ -134,6 +134,7 @@ struct hv_start_fcopy { ...@@ -134,6 +134,7 @@ struct hv_start_fcopy {
struct hv_do_fcopy { struct hv_do_fcopy {
struct hv_fcopy_hdr hdr; struct hv_fcopy_hdr hdr;
__u32 pad;
__u64 offset; __u64 offset;
__u32 size; __u32 size;
__u8 data[DATA_FRAGMENT]; __u8 data[DATA_FRAGMENT];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment