Attachment #399766 for bug #531682

Lines 92-98 Link Here

(-)vmblock-only.orig/linux/file.c (-1 / +1 lines)
92	* and that would try to acquire the inode's semaphore; if the two inodes	92	* and that would try to acquire the inode's semaphore; if the two inodes
93	* are the same we'll deadlock.	93	* are the same we'll deadlock.
94	*/	94	*/
95	if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {	95	if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
96	Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");	96	Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
97	if (filp_close(actualFile, current->files) < 0) {	97	if (filp_close(actualFile, current->files) < 0) {
98	Warning("FileOpOpen: unable to close opened file.\n");	98	Warning("FileOpOpen: unable to close opened file.\n");

Lines 63-69 DentryOpRevalidate(struct dentry *dentry Link Here

(-)vmblock-only.orig/linux/dentry.c (-1 / +1 lines)
63	unsigned int flags) // IN: lookup flags & intent	63	unsigned int flags) // IN: lookup flags & intent
64	{	64	{
65	VMBlockInodeInfo *iinfo;	65	VMBlockInodeInfo *iinfo;
66	struct nameidata actualNd;	66	struct path actualNd;
67	struct dentry *actualDentry;	67	struct dentry *actualDentry;
68	int ret;	68	int ret;
69		69

Lines 322-328 Iget(struct super_block *sb, // IN: f Link Here

(-)vmblock-only.orig/linux/filesystem.c (-1 / +1 lines)
322	{	322	{
323	VMBlockInodeInfo *iinfo;	323	VMBlockInodeInfo *iinfo;
324	struct inode *inode;	324	struct inode *inode;
325	struct nameidata actualNd;	325	struct path actualNd;
326		326
327	ASSERT(sb);	327	ASSERT(sb);
328		328




 * 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).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)
#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)
#else
#define compat_path_lookup(name, flags, nd)     path_lookup(name, flags, nd)
#endif

Return to bug 531682

Lines 26-46 Link Here

(-)vmblock-only.orig/shared/compat_namei.h (-3 / +3 lines)
26	* struct. They were both replaced with a struct path.	26	* struct. They were both replaced with a struct path.
27	*/	27	*/
28	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)	28	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
29	#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry	29	#define compat_vmw_nd_to_dentry(nd) (nd).dentry
30	#else	30	#else
31	#define compat_vmw_nd_to_dentry(nd) (nd).dentry	31	#define compat_vmw_nd_to_dentry(nd) (nd).dentry
32	#endif	32	#endif
33		33
34	/* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */	34	/* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
35	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)	35	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
36	#define compat_path_release(nd) path_put(&(nd)->path)	36	#define compat_path_release(nd) path_put(nd)
37	#else	37	#else
38	#define compat_path_release(nd) path_release(nd)	38	#define compat_path_release(nd) path_release(nd)
39	#endif	39	#endif
40		40
41	/* path_lookup was removed in 2.6.39 merge window VFS merge */	41	/* path_lookup was removed in 2.6.39 merge window VFS merge */
42	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)	42	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
43	#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path))	43	#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd)
44	#else	44	#else
45	#define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)	45	#define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
46	#endif	46	#endif