From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 19 Apr 2015 12:28:49 +0000 (+0200)
Subject: - fixed patch
X-Git-Tag: auto/th/open-vm-tools-9.4.6-8
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=61a1176c6c11f12bf36b75bee34fa29eaddea08d;p=packages%2Fopen-vm-tools.git

- fixed patch
- rel 8
---

diff --git a/open-vm-tools-linux-3.18.3.patch b/open-vm-tools-linux-3.18.3.patch
index 060934c..1852baa 100644
--- a/open-vm-tools-linux-3.18.3.patch
+++ b/open-vm-tools-linux-3.18.3.patch
@@ -4,10 +4,10 @@
                             p,
  #endif
                             &inode->i_dentry,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 3) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 107)
-                            d_alias) {
-+#else
++#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)))
 +                           d_u.d_alias) {
++#else
+                            d_alias) {
 +#endif
           int dcount = compat_d_count(dentry);
           if (dcount) {
@@ -16,10 +16,10 @@
        /* 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)
-          struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
-+#else
++#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)))
 +         struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias);
++#else
+          struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
 +#endif
           dcount = compat_d_count(dentry);
           if (dcount) {
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 33bebec..4777435 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	7
+%define		rel	8
 %define		pname	open-vm-tools
 %define		modsrc	modules/linux
 Summary:	VMWare guest utilities