- fix building with linux 3.14.40

- rel 9

diff --git a/open-vm-tools-linux-3.18.3.patch b/open-vm-tools-linux-3.18.3.patch
index 1852baa0efd5499cd2be906237eabad4a0b24f85..f94b3f383ac4f8748a5f00896533ac49a7e7e91e 100644 (file)
--- 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);

diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 4777435fb3912c5071eddcf67fc1aba573b428b4..31a44f9b5bfe0cfa6864679fd5198c87309ae9b8 100644 (file)
--- 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