From ac28e42a7b04b57e36314018ac44f69926528622 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 19 Apr 2015 14:09:05 +0200 Subject: [PATCH] - fix building with kernel 3.4.107 - rel 7 --- 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 b9420b0..060934c 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) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 3) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 107) d_alias) { +#else + d_u.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) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 3) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 107) struct dentry *dentry = list_entry(pos, struct dentry, d_alias); +#else + struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias); diff --git a/open-vm-tools.spec b/open-vm-tools.spec index a3cd190..33bebec 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 6 +%define rel 7 %define pname open-vm-tools %define modsrc modules/linux Summary: VMWare guest utilities -- 2.44.0