Remove the automount through follow_link() kludge code from pathwalk

Remove the automount through follow_link() kludge code from pathwalk in favour
of using d_automount().

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 3 insertions, 14 deletions

diff --git a/fs/namei.c b/fs/namei.c
index dc50bfb2f5d6..61995fba4e21 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1342,17 +1342,6 @@ fail:
 }
 
 /*
- * This is a temporary kludge to deal with "automount" symlinks; proper
- * solution is to trigger them on follow_mount(), so that do_lookup()
- * would DTRT.  To be killed before 2.6.34-final.
- */
-static inline int follow_on_final(struct inode *inode, unsigned lookup_flags)
-{
-        return inode && unlikely(inode->i_op->follow_link) &&
-                ((lookup_flags & LOOKUP_FOLLOW) || S_ISDIR(inode->i_mode));
-}
-
-/*
  * Name resolution.
  * This is the basic name resolution function, turning a pathname into
  * the final dentry. We expect 'base' to be positive and a directory.
@@ -1490,7 +1479,8 @@ last_component:
                 err = do_lookup(nd, &this, &next, &inode);
                 if (err)
                         break;
-                if (follow_on_final(inode, lookup_flags)) {
+                if (inode && unlikely(inode->i_op->follow_link) &&
+                    (lookup_flags & LOOKUP_FOLLOW)) {
                         if (nameidata_dentry_drop_rcu_maybe(nd, next.dentry))
                                 return -ECHILD;
                         BUG_ON(inode != next.dentry->d_inode);
@@ -2543,8 +2533,7 @@ reval:
                 struct inode *linki = link.dentry->d_inode;
                 void *cookie;
                 error = -ELOOP;
-                /* S_ISDIR part is a temporary automount kludge */
-                if (!(nd.flags & LOOKUP_FOLLOW) && !S_ISDIR(linki->i_mode))
+                if (!(nd.flags & LOOKUP_FOLLOW))
                         goto exit_dput;
                 if (count++ == 32)
                         goto exit_dput;