Changeset 39840 in vbox for trunk/src/VBox

Timestamp:

Jan 23, 2012 5:32:44 PM (13 years ago)

Author:

vboxsync

Message:

more Linux 3.3 fixes

Location:

trunk/src/VBox

Files:

• Additions/linux/sharedfolders/dirops.c (modified) (3 diffs)
• Additions/linux/sharedfolders/vfsmod.c (modified) (1 diff)
• Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

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

@@ -478 +478 @@
  */
 static int sf_create_aux(struct inode *parent, struct dentry *dentry,
-                         int mode, int fDirectory)
+                         umode_t mode, int fDirectory)
 {
     int rc, err;
@@ -576 +576 @@
  * @returns 0 on success, Linux error code otherwise
  */
-static int sf_create(struct inode *parent, struct dentry *dentry, int mode
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-                   , struct nameidata *nd
+static int sf_create(struct inode *parent, struct dentry *dentry, umode_t mode, struct nameidata *nd)
+#else
+static int sf_create(struct inode *parent, struct dentry *dentry, umode_t mode)
 #endif
-                    )
 {
     TRACE();
@@ -594 +594 @@
  * @returns 0 on success, Linux error code otherwise
  */
-static int sf_mkdir(struct inode *parent, struct dentry *dentry, int mode)
+static int sf_mkdir(struct inode *parent, struct dentry *dentry, umode_t mode)
 {
     TRACE();

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

@@ -527 +527 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 static int follow_symlinks = 0;
-module_param(follow_symlinks, bool, 0);
+module_param(follow_symlinks, int, 0);
 MODULE_PARM_DESC(follow_symlinks, "Let host resolve symlinks rather than showing them");
 #endif

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -318 +318 @@
 #undef bool
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+typedef int umode_t
+#endif
+
 /*
  * There are post-2.6.24 kernels (confusingly with unchanged version number)