]>
Commit | Line | Data |
---|---|---|
44d0d795 JR |
1 | --- modules/linux/vmhgfs/filesystem.c.old 2012-06-08 11:46:42.000000000 +0000 |
2 | +++ modules/linux/vmhgfs/filesystem.c 2012-06-08 11:47:57.000000000 +0000 | |
3 | @@ -31,6 +31,7 @@ | |
4 | #include <linux/list.h> | |
5 | #include <linux/module.h> | |
6 | #include <linux/pagemap.h> | |
7 | +#include <linux/version.h> | |
8 | #include "compat_cred.h" | |
9 | #include "compat_dcache.h" | |
10 | #include "compat_fs.h" | |
11 | @@ -375,8 +376,11 @@ | |
12 | __func__)); | |
13 | goto exit; | |
14 | } | |
15 | - | |
16 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) | |
17 | tempRootDentry = d_alloc_root(rootInode); | |
18 | +#else | |
19 | + tempRootDentry = d_make_root(rootInode); | |
20 | +#endif | |
21 | if (tempRootDentry == NULL) { | |
22 | LOG(4, (KERN_WARNING "VMware hgfs: %s: Could not get " | |
23 | "root dentry\n", __func__)); | |
24 | --- modules/linux/vmblock/linux/filesystem.c.old 2012-06-08 11:48:17.000000000 +0000 | |
25 | +++ modules/linux/vmblock/linux/filesystem.c 2012-06-08 11:49:05.000000000 +0000 | |
26 | @@ -29,6 +29,7 @@ | |
27 | #include <linux/proc_fs.h> | |
28 | #include <linux/mount.h> | |
29 | #include <linux/fs.h> | |
30 | +#include <linux/version.h> | |
31 | ||
32 | #include "compat_namei.h" | |
33 | ||
34 | @@ -525,7 +526,11 @@ | |
35 | return -EINVAL; | |
36 | } | |
37 | ||
38 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) | |
39 | rootDentry = d_alloc_root(rootInode); | |
40 | +#else | |
41 | + rootDentry = d_make_root(rootInode); | |
42 | +#endif | |
43 | if (!rootDentry) { | |
44 | iput(rootInode); | |
45 | return -ENOMEM; |