Changeset 95210 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jun 6, 2022 7:34:35 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151718

Message:

Additions: Linux: vboxsf: Initial support for kernel 5.19(-rc1), bugref:10237.

File:

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

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

@@ -3582 +3582 @@
  * shared+writeable fashion.
  */
+#if RTLNX_VER_MIN(5,19,0)
+static int vbsf_read_folio(struct file *file, struct folio *folio)
+{
+    struct page *page = &folio->page;
+#else
 static int vbsf_readpage(struct file *file, struct page *page)
 {
+#endif
     struct inode *inode = VBSF_GET_F_DENTRY(file)->d_inode;
     int           err;
@@ -3729 +3735 @@
  * Called when writing thru the page cache (which we shouldn't be doing).
  */
-int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
-                     unsigned len, unsigned flags, struct page **pagep, void **fsdata)
+static inline void vbsf_write_begin_warn(loff_t pos, unsigned len, unsigned flags)
 {
     /** @todo r=bird: We shouldn't ever get here, should we?  Because we don't use
@@ -3746 +3751 @@
 # endif
     }
+}
+
+# if RTLNX_VER_MIN(5,19,0)
+int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
+                     unsigned len, struct page **pagep, void **fsdata)
+{
+    vbsf_write_begin_warn(pos, len, 0);
+    return simple_write_begin(file, mapping, pos, len, pagep, fsdata);
+}
+# else
+int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
+                     unsigned len, unsigned flags, struct page **pagep, void **fsdata)
+{
+    vbsf_write_begin_warn(pos, len, flags);
     return simple_write_begin(file, mapping, pos, len, flags, pagep, fsdata);
 }
+# endif
+
 #endif /* KERNEL_VERSION >= 2.6.24 */
 
@@ -3821 +3842 @@
  */
 struct address_space_operations vbsf_reg_aops = {
+#if RTLNX_VER_MIN(5,19,0)
+    .read_folio     = vbsf_read_folio,
+#else
     .readpage       = vbsf_readpage,
+#endif
     .writepage      = vbsf_writepage,
     /** @todo Need .writepages if we want msync performance...  */
@@ -3843 +3868 @@
 #endif
 };
-