dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
David Howells 2011-01-14 18:45:53 +00:00 committed by Al Viro
parent 01c64feac4
commit db3729153e
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/namei.c
View File

@ -1341,17 +1341,6 @@ fail:
return PTR_ERR(dentry);
}
/*
* 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
@ -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;