From: green <green>
Date: Mon, 26 Apr 2004 18:14:05 +0000 (+0000)
Subject: Fixup nonprimary nfs_export_kernel for extra arguments to lookup_it &
X-Git-Tag: v1_7_0_51~2^102~11
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1e9b89294d5c266748c3f664bb221793df8e4333;p=fs%2Flustre-release.git

Fixup nonprimary nfs_export_kernel for extra arguments to lookup_it &
d_revalidate_it
Also correct declarations of those two functions in vfs_intent nonprimary
patches.
Completely untested.
---

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch
index 3d554e2..185d6f7 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch
@@ -1631,11 +1631,20 @@ Index: linux-2.4.20/include/linux/dcache.h
  
  /*
   * linux/include/linux/dcache.h
+@@ -84,6 +130,8 @@
+ 	unsigned char d_iname[DNAME_INLINE_LEN]; /* small names */
+ };
+ 
++struct nameidata;
++
+ struct dentry_operations {
+ 	int (*d_revalidate)(struct dentry *, int);
+ 	int (*d_hash) (struct dentry *, struct qstr *);
 @@ -96,8 +141,22 @@
  	int (*d_delete)(struct dentry *);
  	void (*d_release)(struct dentry *);
  	void (*d_iput)(struct dentry *, struct inode *);
-+	int (*d_revalidate_it)(struct dentry *, int, struct lookup_intent *);
++	int (*d_revalidate_it)(struct dentry *, int, struct nameidata *, struct lookup_intent *);
 +	void (*d_pin)(struct dentry *, struct vfsmount * , int);
 +	void (*d_unpin)(struct dentry *, struct vfsmount *, int);
  };
@@ -1724,7 +1733,7 @@ Index: linux-2.4.20/include/linux/fs.h
  	int (*create) (struct inode *,struct dentry *,int);
 +	int (*create_it) (struct inode *,struct dentry *,int, struct lookup_intent *);
  	struct dentry * (*lookup) (struct inode *,struct dentry *);
-+	struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct lookup_intent *, int flags);
++	struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct nameidata *, struct lookup_intent *, int flags);
  	int (*link) (struct dentry *,struct inode *,struct dentry *);
 +	int (*link_raw) (struct nameidata *,struct nameidata *);
  	int (*unlink) (struct inode *,struct dentry *);