[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

["Vadim Kuznetsov" <vadimk@gentoo.org>]

commit:     f366d6993fa2b058d6a15d3ccdaed45de7b70639
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 13:28:42 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Tue May 22 13:28:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=f366d699

d_make_root patch for 3.4 kernel. Bug 411853.
	new file:   app-emulation/vmware-modules/files/264-d-make-root.patch
	modified:   app-emulation/vmware-modules/vmware-modules-264.3.ebuild

---
 .../vmware-modules/files/264-d-make-root.patch     |   16 ++++++++++++++++
 .../vmware-modules/vmware-modules-264.3.ebuild     |    1 +
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/app-emulation/vmware-modules/files/264-d-make-root.patch b/app-emulation/vmware-modules/files/264-d-make-root.patch
new file mode 100644
index 0000000..a02e4ce
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264-d-make-root.patch
@@ -0,0 +1,16 @@
+diff --git a/vmblock-only/linux/filesystem.c b/vmblock-only/linux/filesystem.c
+index b7c535e..a36a01e 100644
+--- a/vmblock-only/linux/filesystem.c
++++ b/vmblock-only/linux/filesystem.c
+@@ -525,7 +525,11 @@ FsOpReadSuper(struct super_block *sb, // OUT: Superblock object
+       return -EINVAL;
+    }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+    rootDentry = d_alloc_root(rootInode);
++#else
++   rootDentry = d_make_root(rootInode);
++#endif
+    if (!rootDentry) {
+       iput(rootInode);
+       return -ENOMEM;

diff --git a/app-emulation/vmware-modules/vmware-modules-264.3.ebuild b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
index afef047..763796d 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
@@ -66,6 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
 }
 
 src_install() {