- 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 b9420b07ff2a2933881dee206803356357339449..060934c412f15ce8769c443de4c66cbd1f7f78da 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)
++#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 a3cd190999563c4e57bbb307fe4b93951b9b0840..33bebec93f5b7427191db47e3735936d30c1afad 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     6
+%define                rel     7
 %define                pname   open-vm-tools
 %define                modsrc  modules/linux
 Summary:       VMWare guest utilities