Changeset 88571 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 16, 2021 5:59:50 PM (4 years ago)

Author:

vboxsync

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

143868

Message:

Additions: Linux: vboxsf: adapt to 5.10.x+ kernels, bugref:9994.

This patch fixed the issue when executables in VBox share
could no be executed even if share was mounted with '-o exec'
option.

File:

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

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

@@ -1468 +1468 @@
 
 
+#if RTLNX_VER_MAX(5,10,0)
 /**
  * Read function used when accessing files that are memory mapped.
@@ -1476 +1477 @@
 static ssize_t vbsf_reg_read_mapped(struct file *file, char /*__user*/ *buf, size_t size, loff_t *off)
 {
-#if RTLNX_VER_MIN(3,16,0)
+# if RTLNX_VER_MIN(3,16,0)
     struct iovec    iov = { .iov_base = buf, .iov_len = size };
     struct iov_iter iter;
@@ -1491 +1492 @@
     return cbRet;
 
-#elif RTLNX_VER_MIN(2,6,19)
+# elif RTLNX_VER_MIN(2,6,19)
     struct iovec    iov = { .iov_base = buf, .iov_len = size };
     struct kiocb    kiocb;
@@ -1506 +1507 @@
     return cbRet;
 
-#else /* 2.6.18 or earlier: */
+# else /* 2.6.18 or earlier: */
     return generic_file_read(file, buf, size, off);
-#endif
+# endif
 }
 
@@ -1626 +1627 @@
 }
 
-
 /**
  * Read from a regular file.
@@ -1692 +1692 @@
     }
 
-#if 0 /* Turns out this is slightly slower than locking the pages even for 4KB reads (4.19/amd64). */
+# if 0 /* Turns out this is slightly slower than locking the pages even for 4KB reads (4.19/amd64). */
     /*
      * For medium sized requests try use a bounce buffer.
@@ -1721 +1721 @@
         }
     }
-#endif
+# endif
 
     return vbsf_reg_read_locking(file, buf, size, off, pSuperInfo, sf_r);
 }
+#endif /* < 5.10.0 */
 
 
@@ -1814 +1815 @@
 
 
+#if RTLNX_VER_MAX(5,10,0)
 /**
  * Fallback case of vbsf_reg_write() that locks the user buffers and let the host
@@ -1941 +1943 @@
 }
 
-
 /**
  * Write to a regular file.
@@ -1987 +1988 @@
         && mapping->nrpages > 0
         && mapping_writably_mapped(mapping)) {
-#if RTLNX_VER_MIN(2,6,32)
+# if RTLNX_VER_MIN(2,6,32)
         int err = filemap_fdatawait_range(mapping, pos, pos + size - 1);
         if (err)
             return err;
-#else
+# else
         /** @todo ...   */
-#endif
+# endif
     }
 
@@ -2035 +2036 @@
     }
 
-#if 0 /* Turns out this is slightly slower than locking the pages even for 4KB reads (4.19/amd64). */
+# if 0 /* Turns out this is slightly slower than locking the pages even for 4KB reads (4.19/amd64). */
     /*
      * For medium sized requests try use a bounce buffer.
@@ -2074 +2075 @@
         }
     }
-#endif
+# endif
 
     return vbsf_reg_write_locking(file, buf, size, off, pos, inode, sf_i, pSuperInfo, sf_r);
 }
+#endif /* < 5.10.0 */
 
 #if RTLNX_VER_MIN(2,6,19)
@@ -3506 +3508 @@
 struct file_operations vbsf_reg_fops = {
     .open            = vbsf_reg_open,
+#if RTLNX_VER_MAX(5,10,0)
     .read            = vbsf_reg_read,
     .write           = vbsf_reg_write,
+#endif
 #if RTLNX_VER_MIN(3,16,0)
     .read_iter       = vbsf_reg_read_iter,