Changeset 42880 in vbox for trunk/src/VBox

Timestamp:

Aug 20, 2012 12:19:31 PM (12 years ago)

Author:

vboxsync

Message:

Linux Shared Folders: more Linux 3.6 fixes

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (3 diffs)
• utils.c (modified) (2 diffs)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -311 +311 @@
  */
 static struct dentry *sf_lookup(struct inode *parent, struct dentry *dentry
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+                                , unsigned int flags
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
                                 , struct nameidata *nd
 #endif
@@ -586 +588 @@
  * @returns 0 on success, Linux error code otherwise
  */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+static int sf_create(struct inode *parent, struct dentry *dentry, umode_t mode, bool excl)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
 static int sf_create(struct inode *parent, struct dentry *dentry, umode_t mode, struct nameidata *nd)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -252 +252 @@
    [sf_inode_revalidate] */
 static int
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+sf_dentry_revalidate(struct dentry *dentry, unsigned flags)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+sf_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
+#else
 sf_dentry_revalidate(struct dentry *dentry, int flags)
-#else
-sf_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
-#endif
-{
-    TRACE();
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+#endif
+{
+    TRACE();
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+    if (flags & LOOKUP_RCU)
+        return -ECHILD;
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
     /* see Documentation/filesystems/vfs.txt */
     if (nd && nd->flags & LOOKUP_RCU)