Changeset 33440 in vbox for trunk

Timestamp:

Oct 25, 2010 8:19:36 PM (14 years ago)

Author:

vboxsync

Message:

Linux Additions: symlinks only for Linux 2.6 guests

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

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

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

@@ -739 +739 @@
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 static int sf_symlink(struct inode *parent, struct dentry *dentry, const char *symname)
 {
@@ -799 +800 @@
     return err;
 }
+#endif
 
 struct inode_operations sf_dir_iops =

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

@@ -1 +1 @@
 #include "vfsmod.h"
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 
 static void *sf_follow_link(struct dentry *dentry, struct nameidata *nd)
@@ -38 +40 @@
         .put_link       = sf_put_link
 };
+
+#endif

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

@@ -112 +112 @@
         inode->i_nlink = 1;
     }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
     else if (RTFS_IS_SYMLINK(attr->fMode))
     {
@@ -120 +121 @@
         inode->i_nlink = 1;
     }
+#endif
     else
     {

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

@@ -472 +472 @@
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 static int follow_symlinks = 0;
 module_param(follow_symlinks, bool, 0);
 MODULE_PARM_DESC(follow_symlinks, "Let host resolve symlinks rather than showing them");
+#endif
 
 /* Module initialization/finalization handlers */
@@ -526 +528 @@
     }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
     if (!follow_symlinks)
     {
@@ -536 +539 @@
         }
     }
-
+#endif
 
     printk(KERN_DEBUG