Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 400034 Details for
Bug 531682
app-emulation/vmware-workstation-11.0.0.2305329 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
304-vmblock-3.18.patch
304-vmblock-3.18.patch (text/plain), 2.76 KB, created by
Daniel Augustin
on 2015-03-29 14:02:30 UTC
(
hide
)
Description:
304-vmblock-3.18.patch
Filename:
MIME Type:
Creator:
Daniel Augustin
Created:
2015-03-29 14:02:30 UTC
Size:
2.76 KB
patch
obsolete
>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"); > >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 >@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry > unsigned int flags) // IN: lookup flags & intent > { > VMBlockInodeInfo *iinfo; >- struct nameidata actualNd; >+ struct path actualNd; > struct dentry *actualDentry; > int ret; > >diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c >--- vmblock-only.orig/linux/filesystem.c 2014-11-20 19:29:15.000000000 -0500 >+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -0500 >@@ -322,7 +322,7 @@ Iget(struct super_block *sb, // IN: f > { > VMBlockInodeInfo *iinfo; > struct inode *inode; >- struct nameidata actualNd; >+ struct path actualNd; > > ASSERT(sb); > >diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h >--- vmblock-only.orig/shared/compat_namei.h 2014-11-20 19:29:15.000000000 -0500 >+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -0500 >@@ -26,21 +26,21 @@ > * struct. They were both replaced with a struct path. > */ > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) >-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry >+#define compat_vmw_nd_to_dentry(nd) (nd).dentry > #else > #define compat_vmw_nd_to_dentry(nd) (nd).dentry > #endif > > /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */ > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) >-#define compat_path_release(nd) path_put(&(nd)->path) >+#define compat_path_release(nd) path_put(nd) > #else > #define compat_path_release(nd) path_release(nd) > #endif > > /* path_lookup was removed in 2.6.39 merge window VFS merge */ > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) >-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path)) >+#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd) > #else > #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd) > #endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 531682
:
393860
|
393862
|
393864
|
393866
|
393868
|
394828
|
396480
|
396482
|
396484
|
399520
|
399760
|
399762
|
399764
|
399766
|
399768
|
399770
|
400032
| 400034 |
405520
|
405522
|
410716
|
410718