From 81044853f3bd31120fb6224a44d16aa498db0885 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 1 May 2015 00:05:39 +0200 Subject: [PATCH] - fix building with linux 3.10.76 - rel 10 --- open-vm-tools-linux-3.18.3.patch | 4 ++-- open-vm-tools.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/open-vm-tools-linux-3.18.3.patch b/open-vm-tools-linux-3.18.3.patch index f94b3f3..d1ffb29 100644 --- a/open-vm-tools-linux-3.18.3.patch +++ b/open-vm-tools-linux-3.18.3.patch @@ -4,7 +4,7 @@ p, #endif &inode->i_dentry, -+#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))) ++#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))) + d_u.d_alias) { +#else d_alias) { @@ -16,7 +16,7 @@ /* Find a dentry with valid d_count. Refer bug 587879. */ list_for_each(pos, &inode->i_dentry) { int dcount; -+#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))) ++#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))) + struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias); +#else struct dentry *dentry = list_entry(pos, struct dentry, d_alias); diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 31a44f9..631a7d6 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -22,7 +22,7 @@ exit 1 %define subver %(echo %{snap} | tr -d .) %define ver 9.4.6 %define rev 1770165 -%define rel 9 +%define rel 10 %define pname open-vm-tools %define modsrc modules/linux Summary: VMWare guest utilities -- 2.44.0