Changeset 96227 in vbox

Timestamp:

Aug 16, 2022 3:38:28 PM (2 years ago)

Author:

vboxsync

Message:

Additions: Linux: vboxsf: Initial support for kernel 6.0, bugref:10279.

File:

• trunk/src/VBox/Additions/linux/sharedfolders/regops.c (modified) (4 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/regops.c

@@ -2096 +2096 @@
 #endif /* < 5.10.0 */
 #if RTLNX_VER_MIN(2,6,19)
+/* See kernel 6.0.0 change eba2d3d798295dc43cae8fade102f9d083a2a741. */
+# if RTLNX_VER_MIN(6,0,0)
+#  define VBOX_IOV_GET_PAGES iov_iter_get_pages2
+# else
+#  define VBOX_IOV_GET_PAGES iov_iter_get_pages
+# endif
 
 /**
@@ -2186 +2192 @@
                     iov_iter_advance(iter, 0);
 # endif
-                cbSegRet = iov_iter_get_pages(iter, papPages, iov_iter_count(iter), cMaxPages, &offPage0);
+                cbSegRet = VBOX_IOV_GET_PAGES(iter, papPages, iov_iter_count(iter), cMaxPages, &offPage0);
                 if (cbSegRet > 0) {
+# if RTLNX_VER_MAX(6,0,0)
                     iov_iter_advance(iter, cbSegRet);
+#endif
                     cbChunk    = (size_t)cbSegRet;
                     cPages     = RT_ALIGN_Z(offPage0 + cbSegRet, PAGE_SIZE) >> PAGE_SHIFT;
@@ -2212 +2220 @@
                     cbSeg = iov_iter_single_seg_count(iter);
                 }
-                cbSegRet = iov_iter_get_pages(iter, &papPages[cPages], iov_iter_count(iter), 1, &offPgProbe);
+                cbSegRet = VBOX_IOV_GET_PAGES(iter, &papPages[cPages], iov_iter_count(iter), 1, &offPgProbe);
                 if (cbSegRet > 0) {
+# if RTLNX_VER_MAX(6,0,0)
                     iov_iter_advance(iter, cbSegRet); /** @todo maybe not do this if we stash the page? */
+#endif
                     Assert(offPgProbe + cbSegRet <= PAGE_SIZE);
                     if (offPgProbe == 0) {
@@ -2230 +2240 @@
                         cbSeg -= cbSegRet;
                         if (cbSeg > 0) {
-                            cbSegRet = iov_iter_get_pages(iter, &papPages[cPages], iov_iter_count(iter), cMaxPages, &offPgProbe);
+                            cbSegRet = VBOX_IOV_GET_PAGES(iter, &papPages[cPages], iov_iter_count(iter), cMaxPages, &offPgProbe);
                             if (cbSegRet > 0) {
                                 size_t const cPgRet = RT_ALIGN_Z((size_t)cbSegRet, PAGE_SIZE) >> PAGE_SHIFT;
                                 Assert(offPgProbe == 0);
+# if RTLNX_VER_MAX(6,0,0)
                                 iov_iter_advance(iter, cbSegRet);
+# endif
                                 SFLOG3(("vbsf_iter_lock_pages: iov_iter_get_pages() -> %#zx; %#zx pages\n", cbSegRet, cPgRet));
                                 cPages    += cPgRet;