From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6C7EE138CCE for ; Tue, 5 May 2015 17:10:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D6B0E089D; Tue, 5 May 2015 17:10:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3679E089D for ; Tue, 5 May 2015 17:10:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5518C340845 for ; Tue, 5 May 2015 17:10:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC0F59AC for ; Tue, 5 May 2015 17:10:00 +0000 (UTC) From: "Evan Teran" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Evan Teran" Message-ID: <1430845756.633505a21b03a51abaee1d90875693741cdb119e.eteran@gentoo> Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/ X-VCS-Repository: proj/vmware X-VCS-Files: app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch X-VCS-Directories: app-emulation/vmware-modules/files/ X-VCS-Committer: eteran X-VCS-Committer-Name: Evan Teran X-VCS-Revision: 633505a21b03a51abaee1d90875693741cdb119e X-VCS-Branch: master Date: Tue, 5 May 2015 17:10:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ccfa60fd-9e59-43c7-a450-7cacc95669c2 X-Archives-Hash: a42159592930b207119d334fce15bdb6 commit: 633505a21b03a51abaee1d90875693741cdb119e Author: Evan Teran gmail com> AuthorDate: Tue May 5 17:09:16 2015 +0000 Commit: Evan Teran gmail com> CommitDate: Tue May 5 17:09:16 2015 +0000 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=633505a2 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(+) 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");