Changeset 40735 in vbox

Timestamp:

Apr 1, 2012 9:28:43 PM (13 years ago)

Author:

vboxsync

Message:

Additions/linux/sharefolders: linux 3.4-rc1: d_make_root is correct here

File:

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

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

@@ -199 +199 @@
     SHFLFSOBJINFO fsinfo;
     struct vbsf_mount_info_new *info;
+    bool fInodePut = true;
 
     TRACE();
@@ -296 +297 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
-    droot = d_obtain_alias(iroot);
+    droot = d_make_root(iroot);
 #else
     droot = d_alloc_root(iroot);
@@ -304 +305 @@
         err = -ENOMEM;  /* XXX */
         LogFunc(("d_alloc_root failed\n"));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
+        fInodePut = false;
+#endif
         goto fail5;
     }
@@ -315 +319 @@
 
 fail4:
-    iput(iroot);
+    if (fInodePut)
+        iput(iroot);
 
 fail3: