Changeset 77706 in vbox for trunk/src/VBox/Additions/linux/sharedfolders

Timestamp:

Mar 14, 2019 8:10:40 PM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Various build fixes for older kernels (atomic_open, read_iter, write_iter). bugref:9172

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (5 diffs)
• regops.c (modified) (2 diffs)

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

@@ -35 +35 @@
 #include "vfsmod.h"
 #include <iprt/err.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+# define d_in_lookup(a_pDirEntry)  (d_unhashed(a_pDirEntry))
+#endif
+
 
 
@@ -903 +908 @@
  * of that approach.  The call combines the lookup and open.
  */
-static int vbsf_inode_atomic_open(struct inode *pDirInode, struct dentry *dentry, struct file *file,  unsigned fOpen, umode_t fMode)
+static int vbsf_inode_atomic_open(struct inode *pDirInode, struct dentry *dentry, struct file *file,  unsigned fOpen,
+                                  umode_t fMode
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+                                  , int *opened
+# endif
+                                  )
 {
     SFLOGFLOW(("vbsf_inode_atomic_open: pDirInode=%p dentry=%p file=%p fOpen=%#x, fMode=%#x\n", pDirInode, dentry, file, fOpen, fMode));
@@ -952 +962 @@
                  * and call finish_open() to do the remaining open() work.
                  */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
                 if (fCreated)
                     file->f_mode |= FMODE_CREATED;
                 rc = finish_open(file, dentry, generic_file_open);
+# else
+                if (fCreated)
+                    *opened |= FILE_CREATED;
+                rc = finish_open(file, dentry, generic_file_open, opened);
+# endif
                 if (rc == 0) {
                     /*
@@ -1013 +1029 @@
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
 static int vbsf_inode_create(struct inode *parent, struct dentry *dentry, umode_t mode, struct nameidata *nd)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 75)
 static int vbsf_inode_create(struct inode *parent, struct dentry *dentry, int mode, struct nameidata *nd)
 #else
@@ -1019 +1035 @@
 #endif
 {
-/** @todo @a nd (struct nameidata) contains intent with partial open flags for
- *        2.6.0-3.5.999.  In 3.6.0 atomic_open was introduced and stuff
- *        changed (investigate)... */
+    uint32_t fCreateFlags = SHFL_CF_ACT_CREATE_IF_NEW
+                          | SHFL_CF_ACT_FAIL_IF_EXISTS
+                          | SHFL_CF_ACCESS_READWRITE;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 75)
+    /* Clear the RD flag if write-only access requested.  Otherwise assume we
+       need write access to create stuff. */
+    if (!(nd->intent.open.flags & 1) ) {
+        fCreateFlags &= SHFL_CF_ACCESS_READWRITE;
+        fCreateFlags |= SHFL_CF_ACCESS_WRITE;
+    }
+    /* (file since 2.6.15) */
+#endif
     TRACE();
     AssertMsg(!(mode & S_IFMT) || (mode & S_IFMT) == S_IFREG, ("0%o\n", mode));
-    return vbsf_create_worker(parent, dentry, (mode & ~S_IFMT) | S_IFREG,
-                                SHFL_CF_ACT_CREATE_IF_NEW
-                              | SHFL_CF_ACT_FAIL_IF_EXISTS
-                              | SHFL_CF_ACCESS_READWRITE,
+    return vbsf_create_worker(parent, dentry, (mode & ~S_IFMT) | S_IFREG, fCreateFlags,
                               true /*fStashHandle*/, false /*fDoLookup*/, NULL /*phHandle*/, NULL /*fCreated*/);
 }

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

@@ -53 +53 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
 # define SEEK_END 2
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+# define iter_is_iovec(a_pIter) ( !((a_pIter)->type & (ITER_KVEC | ITER_BVEC)) )
 #endif
 
@@ -1795 +1799 @@
     /** @todo This should be handled by the host, it returning the new file
      *        offset when appending.  We may have an outdated i_size value here! */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
     if (kio->ki_flags & IOCB_APPEND)
+#else
+    if (kio->ki_filp->f_flags & O_APPEND)
+#endif
         kio->ki_pos = offFile = i_size_read(inode);