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

Timestamp:

Jul 30, 2015 3:52:53 PM (9 years ago)

Author:

vboxsync

Message:

Additions/linux/sharedfolders: Linux 4.2 fix

File:

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

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

@@ -21 +21 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+static const char *sf_follow_link(struct dentry *dentry, void **cookie)
+# else
 static void *sf_follow_link(struct dentry *dentry, struct nameidata *nd)
+# endif
 {
     struct inode *inode = dentry->d_inode;
@@ -41 +45 @@
         }
     }
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+    return error ? ERR_PTR(error) : (*cookie = path);
+# else
     nd_set_link(nd, error ? ERR_PTR(error) : path);
     return NULL;
+# endif
 }
 
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
 static void sf_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
 {
@@ -51 +60 @@
         free_page((unsigned long)page);
 }
+#endif
 
 struct inode_operations sf_lnk_iops =
@@ -56 +66 @@
     .readlink       = generic_readlink,
     .follow_link    = sf_follow_link,
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+    .put_link       = free_page_put_link,
+# else
     .put_link       = sf_put_link
+# endif
 };