Additions: Linux: vboxsf: Introduce initial support for kernel 6.4 (rename macro), bugref:10441.

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99667 cfe28804-0f27-0410-a406-dd0f0b0b656f

1 files changed, 9 insertions, 8 deletions

diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
index c522f52ca35..5e2bd03250e 100644
--- a/src/VBox/Additions/linux/sharedfolders/regops.c
+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -76,13 +76,6 @@
 # define PageUptodate(a_pPage) Page_Uptodate(a_pPage)
 #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
-
 
 /*********************************************************************************************************************************
 *   Defined Constants And Macros                                                                                                 *
@@ -95,6 +88,14 @@
 # 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
+
 
 /*********************************************************************************************************************************
 *   Structures and Typedefs                                                                                                      *
@@ -2406,7 +2407,7 @@ static size_t vbsf_iter_max_span_of_pages(struct iov_iter *iter)
 # if RTLNX_VER_MIN(3,16,0)
     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;