diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-07-05 21:44:50 +0200 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2016-08-11 10:07:58 +0200 |
commit | 3fe25415bb6f3e539d06621a983bac9049cf4b48 (patch) | |
tree | d14067c08d72f5652e69cf5c3f766514ecbd2b05 /app-emulation/open-vm-tools-kmod | |
parent | app-emulation/libguestfs: remove unused file (diff) | |
download | gentoo-3fe25415bb6f3e539d06621a983bac9049cf4b48.tar.gz gentoo-3fe25415bb6f3e539d06621a983bac9049cf4b48.tar.bz2 gentoo-3fe25415bb6f3e539d06621a983bac9049cf4b48.zip |
app-emulation/open-vm-tools-kmod: remove unused patches
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'app-emulation/open-vm-tools-kmod')
-rw-r--r-- | app-emulation/open-vm-tools-kmod/files/1098359-vmblock-3.10.0.patch | 24 | ||||
-rw-r--r-- | app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch | 42 |
2 files changed, 0 insertions, 66 deletions
diff --git a/app-emulation/open-vm-tools-kmod/files/1098359-vmblock-3.10.0.patch b/app-emulation/open-vm-tools-kmod/files/1098359-vmblock-3.10.0.patch deleted file mode 100644 index 040d5145e9e2..000000000000 --- a/app-emulation/open-vm-tools-kmod/files/1098359-vmblock-3.10.0.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/modules/linux/vmblock/linux/control.c -+++ b/modules/linux/vmblock/linux/control.c -@@ -208,9 +208,10 @@ - VMBlockSetProcEntryOwner(controlProcMountpoint); - - /* Create /proc/fs/vmblock/dev */ -- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME, -- VMBLOCK_CONTROL_MODE, -- controlProcDirEntry); -+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, -+ VMBLOCK_CONTROL_MODE, -+ controlProcDirEntry, -+ &ControlFileOps); - if (!controlProcEntry) { - Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n"); - remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry); -@@ -218,7 +219,6 @@ - return -EINVAL; - } - -- controlProcEntry->proc_fops = &ControlFileOps; - return 0; - } - diff --git a/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch b/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch deleted file mode 100644 index 3918162a7057..000000000000 --- a/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch +++ /dev/null @@ -1,42 +0,0 @@ -Source: https://github.com/rasa/vmware-tools-patches/ - ---- a/modules/linux/vmhgfs/inode.c -+++ b/modules/linux/vmhgfs/inode.c -@@ -31,6 +31,9 @@ - #include <linux/namei.h> - #endif - #include <linux/highmem.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) -+#include <linux/dcache.h> -+#endif - - #include "compat_cred.h" - #include "compat_fs.h" -@@ -1890,7 +1893,11 @@ - #endif - &inode->i_dentry, - d_alias) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) -+ int dcount = d_count(dentry); -+#else - int dcount = dentry->d_count; -+#endif - if (dcount) { - LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount)); - return HgfsAccessInt(dentry, mask & (MAY_READ | MAY_WRITE | MAY_EXEC)); -@@ -1943,10 +1950,12 @@ - list_for_each(pos, &inode->i_dentry) { - int dcount; - struct dentry *dentry = list_entry(pos, struct dentry, d_alias); --#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) -- dcount = atomic_read(&dentry->d_count); --#else -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) -+ dcount = d_count(dentry); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) - dcount = dentry->d_count; -+#else -+ dcount = atomic_read(&dentry->d_count); - #endif - if (dcount) { - LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount)); |