blob: 20c8fbd3fd537d84f6da38f3296bed4789df69d4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
Initial support for kernel 6.4
https://www.virtualbox.org/changeset/99667/vbox
Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
--- a/src/VBox/Additions/linux/sharedfolders/regops.c
+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -77,11 +77,4 @@
#endif
-/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */
-#if RTLNX_VER_MIN(6,4,0)
-# define VBOX_ITER_IOV(_iter) iter_iov(_iter)
-#else
-# define VBOX_ITER_IOV(_iter) iter->iov
-#endif
-
/*********************************************************************************************************************************
@@ -94,4 +87,12 @@
#else
# define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->type)
+#endif
+
+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field
+ * of struct iov_iter. */
+#if RTLNX_VER_MIN(6,4,0)
+# define VBSF_GET_ITER_IOV(_iter) iter_iov(_iter)
+#else
+# define VBSF_GET_ITER_IOV(_iter) iter->iov
#endif
@@ -2407,5 +2408,5 @@
if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
# endif
- const struct iovec *pCurIov = VBOX_ITER_IOV(iter);
+ const struct iovec *pCurIov = VBSF_GET_ITER_IOV(iter);
size_t cLeft = iter->nr_segs;
size_t cPagesSpan = 0;
|
