From 5e1d474f79acf546d71975b60a4c98b036e23298 Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Wed, 8 Apr 2009 11:05:18 +0000
Subject: [PATCH] kill one configure check Branch b1_6 b=14250 i=shadow

---
 lustre/autoconf/lustre-core.m4         | 17 -----------------
 lustre/include/linux/lustre_compat25.h |  2 ++
 lustre/llite/symlink.c                 |  6 +-----
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index bf9e25a..bbe3bdf 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1398,22 +1398,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-# 2.6.26 remove path_release and use path_put instead
-AC_DEFUN([LC_PATH_RELEASE],
-[AC_MSG_CHECKING([if path_release exist])
-LB_LINUX_TRY_COMPILE([
-    #include <linux/dcache.h>
-    #include <linux/namei.h>
-],[
-    path_release(NULL);
-],[
-    AC_DEFINE(HAVE_PATH_RELEASE, 1, [path_release exist])
-    AC_MSG_RESULT([yes])
-],[
-    AC_MSG_RESULT([no]) 
-])
-])
-
 #2.6.27
 AC_DEFUN([LC_INODE_PERMISION_2ARGS],
 [AC_MSG_CHECKING([inode_operations->permission have two args])
@@ -1596,7 +1580,6 @@ AC_DEFUN([LC_PROG_LINUX],
           # 2.6.26
           LC_FS_STRUCT_USE_PATH
           LC_RCU_LIST_SAFE
-          LC_PATH_RELEASE
 
           # 2.6.27
           LC_INODE_PERMISION_2ARGS
diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index dee7323..def34ee 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -462,9 +462,11 @@ void remove_shrinker(struct shrinker *shrinker)
 #ifdef HAVE_FS_STRUCT_USE_PATH
 #define cfs_fs_pwd(fs)       ((fs)->pwd.dentry)
 #define cfs_fs_mnt(fs)       ((fs)->pwd.mnt)
+#define cfs_path_put(nd)     path_put(&(nd)->path)
 #else
 #define cfs_fs_pwd(fs)       ((fs)->pwd)
 #define cfs_fs_mnt(fs)       ((fs)->pwdmnt)
+#define cfs_path_put(nd)     path_release(nd)
 #endif
 
 #ifndef list_for_each_safe_rcu
diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index fb0b25f..acaf37a 100644
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -177,12 +177,8 @@ static LL_FOLLOW_LINK_RETURN_TYPE ll_follow_link(struct dentry *dentry, struct n
                 up(&lli->lli_size_sem);
         }
         if (rc) {
-#ifdef HAVE_PATH_RELEASE
-                path_release(nd); /* Kernel assumes that ->follow_link()
+                cfs_path_put(nd); /* Kernel assumes that ->follow_link()
                                      releases nameidata on error */
-#else
-                path_put(&nd->path);
-#endif
                 GOTO(out, rc);
         }
 
-- 
1.8.3.1