b=2790

r=phil

revert global namespace changes

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 94dc98d..01a9c8a 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -194,12 +194,7 @@ void ll_frob_intent(struct lookup_intent **itp, struct lookup_intent *deft)
         it->it_op_release = ll_intent_release;
 }
 
-#if (LUSTRE_KERNEL_VERSION < 33)
 int ll_revalidate_it(struct dentry *de, int flags, struct lookup_intent *it)
-#else
-int ll_revalidate_it(struct dentry *de, int flags, struct nameidata *nd,
-                     struct lookup_intent *it)
-#endif
 {
         int rc;
         struct ll_fid pfid, cfid;

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 5784eb8..258c3b8 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -320,14 +320,8 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset,
 }
 
 
-#if (LUSTRE_KERNEL_VERSION < 33)
 static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
                                    struct lookup_intent *it, int flags)
-#else
-static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
-                                   struct nameidata *nd,
-                                   struct lookup_intent *it, int flags)
-#endif
 {
         struct dentry *save = dentry, *retval;
         struct ll_fid pfid;