From f2e91cc3fe61956e7661eae9da82ddf746e63824 Mon Sep 17 00:00:00 2001
From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Wed, 30 Mar 2011 18:32:04 -0400
Subject: [PATCH] Linux: Fix fallout from path_lookup commit

Fix a few issues with the recent commit to deal withg the removal
of path_lookup, spotted on RHEL 5:
- the configure tests needs fs.h to be included before namei.h, to
get the definition of struct inode
- we need to avoid the use of struct path unless its needed; on
older kernels the structure doesn't exist

Change-Id: I6251a96a371a50548dcafc70d94e91b52fc2922a
Reviewed-on: http://gerrit.openafs.org/4382
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 acinclude.m4               |  3 ++-
 src/afs/LINUX/osi_compat.h | 19 +++++++++++++------
 src/afs/LINUX/osi_misc.c   | 11 +++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 8c92b66f4f..7452cbccd3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -848,7 +848,8 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 				     [#include <linux/pagevec.h>],
 				     [__pagevec_lru_add_file(NULL);])
 		 AC_CHECK_LINUX_FUNC([path_lookup],
-				     [#include <linux/namei.h>],
+				     [#include <linux/fs.h>
+				      #include <linux/namei.h>],
 				     [path_lookup(NULL, 0, NULL);])
 		 AC_CHECK_LINUX_FUNC([rcu_read_lock],
 				     [#include <linux/rcupdate.h>],
diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
index e4f0735a8d..b94295c063 100644
--- a/src/afs/LINUX/osi_compat.h
+++ b/src/afs/LINUX/osi_compat.h
@@ -403,17 +403,24 @@ afs_inode_setattr(struct osi_file *afile, struct iattr *newattrs) {
     return code;
 }
 
-static inline int
-afs_kern_path(char *aname, int flags, struct nameidata *nd, struct path *path) {
 #if defined(HAVE_LINUX_PATH_LOOKUP)
+static inline int
+afs_kern_path(char *aname, int flags, struct nameidata *nd) {
     return path_lookup(aname, flags, nd);
-#else
-    return kern_path(aname, flags, path);
-#endif
 }
+#else
+static inline int
+afs_kern_path(char *aname, int flags, struct path *path) {
+    return kern_path(aname, flags, path);
+}
+#endif
 
 static inline void
-afs_get_dentry_ref(struct nameidata *nd, struct path *path, struct vfsmount **mnt, struct dentry **dpp) {
+#if defined(HAVE_LINUX_PATH_LOOKUP)
+afs_get_dentry_ref(struct nameidata *nd, struct vfsmount **mnt, struct dentry **dpp) {
+#else
+afs_get_dentry_ref(struct path *path, struct vfsmount **mnt, struct dentry **dpp) {
+#endif
 #if defined(STRUCT_NAMEIDATA_HAS_PATH)
 # if defined(HAVE_LINUX_PATH_LOOKUP)
     *dpp = dget(nd->path.dentry);
diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index 1158304aba..fb740db978 100644
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -59,17 +59,20 @@ osi_lookupname_internal(char *aname, int followlink, struct vfsmount **mnt,
 			struct dentry **dpp)
 {
     int code;
-    struct nameidata nd;
-    struct path path;
+#if defined(HAVE_LINUX_PATH_LOOKUP)
+    struct nameidata path_data;
+#else
+    struct path path_data;
+#endif
     int flags = LOOKUP_POSITIVE;
     code = ENOENT;
 
     if (followlink)
        flags |= LOOKUP_FOLLOW;
-    code = afs_kern_path(aname, flags, &nd, &path);
+    code = afs_kern_path(aname, flags, &path_data);
 
     if (!code)
-	afs_get_dentry_ref(&nd, &path, mnt, dpp);
+	afs_get_dentry_ref(&path_data, mnt, dpp);
 
     return code;
 }