From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 19 Apr 2015 12:09:05 +0000 (+0200)
Subject: - fix building with kernel 3.4.107
X-Git-Tag: auto/th/open-vm-tools-9.4.6-7
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=ac28e42a7b04b57e36314018ac44f69926528622;p=packages%2Fopen-vm-tools.git

- fix building with kernel 3.4.107
- rel 7
---

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