[packages/open-vm-tools] - fix building with linux 3.14.40 - rel 9

[baggins]

commit 62b61bb56b199fc43e639526dac237b75d0698ad
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri May 1 00:03:49 2015 +0200

    - fix building with linux 3.14.40
    - rel 9

 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.spec b/open-vm-tools.spec
index 4777435..31a44f9 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	8
+%define		rel	9
 %define		pname	open-vm-tools
 %define		modsrc	modules/linux
 Summary:	VMWare guest utilities
diff --git a/open-vm-tools-linux-3.18.3.patch b/open-vm-tools-linux-3.18.3.patch
index 1852baa..f94b3f3 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)))
++#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)))
 +                           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)))
++#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)))
 +         struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias);
 +#else
           struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/62b61bb56b199fc43e639526dac237b75d0698ad