From 633505a21b03a51abaee1d90875693741cdb119e Mon Sep 17 00:00:00 2001 From: Evan Teran Date: Tue, 5 May 2015 13:09:16 -0400 Subject: looks like this patch was missing a portion, my bad Package-Manager: portage-2.2.18 --- .../vmware-modules/files/271-3.19-01-vmblock-path.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'app-emulation') diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch index 4bf17e1..178d147 100644 --- a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch +++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch @@ -1,3 +1,6 @@ +Sources: +https://531682.bugs.gentoo.org/attachment.cgi?id=396484 +https://531682.bugs.gentoo.org/attachment.cgi?id=396482 diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c --- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.000000000 -0500 +++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -0500 @@ -50,3 +53,15 @@ diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_na #else #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd) #endif +diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c +--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500 ++++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -0500 +@@ -92,7 +92,7 @@ + * and that would try to acquire the inode's semaphore; if the two inodes + * are the same we'll deadlock. + */ +- if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) { ++ if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) { + Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n"); + if (filp_close(actualFile, current->files) < 0) { + Warning("FileOpOpen: unable to close opened file.\n"); -- cgit v1.2.3-65-gdbad