]>
Commit | Line | Data |
---|---|---|
a74b146f JR |
1 | --- open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/inode.c~ 2015-01-26 00:51:45.000000000 +0100 |
2 | +++ open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/inode.c 2015-01-26 00:54:24.305830333 +0100 | |
3 | @@ -1859,7 +1859,11 @@ | |
4 | p, | |
5 | #endif | |
6 | &inode->i_dentry, | |
81044853 | 7 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 3)) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 107)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0))) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 40)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0))) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 76)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))) |
a74b146f | 8 | + d_u.d_alias) { |
61a1176c JR |
9 | +#else |
10 | d_alias) { | |
a74b146f JR |
11 | +#endif |
12 | int dcount = compat_d_count(dentry); | |
13 | if (dcount) { | |
14 | LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount)); | |
15 | @@ -1912,7 +1916,11 @@ | |
16 | /* Find a dentry with valid d_count. Refer bug 587879. */ | |
17 | list_for_each(pos, &inode->i_dentry) { | |
18 | int dcount; | |
81044853 | 19 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 3)) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 107)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0))) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 40)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0))) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 76)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))) |
a74b146f | 20 | + struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias); |
61a1176c JR |
21 | +#else |
22 | struct dentry *dentry = list_entry(pos, struct dentry, d_alias); | |
a74b146f JR |
23 | +#endif |
24 | dcount = compat_d_count(dentry); | |
25 | if (dcount) { | |
26 | LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount)); |