diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2010-02-16 18:09:36 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 15:55:50 -0700 |
| commit | 1c5b7aee1288404afff343354e7b4ff32f3fb5f0 (patch) | |
| tree | 3e9f4c02bb7263e8c8319cb7e8fa1ccbc8855fac | |
| parent | 610370eb6f789cce3c79b3d07eef825939ad5a6b (diff) | |
fix LOOKUP_FOLLOW on automount "symlinks"
commit ac278a9c505092dd82077a2446af8f9fc0d9c095 upstream.
Make sure that automount "symlinks" are followed regardless of LOOKUP_FOLLOW;
it should have no effect on them.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/namei.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index b224905ff98e..20ab69f3320a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -823,6 +823,17 @@ 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. @@ -964,8 +975,7 @@ last_component: if (err) break; inode = next.dentry->d_inode; - if ((lookup_flags & LOOKUP_FOLLOW) - && inode && inode->i_op->follow_link) { + if (follow_on_final(inode, lookup_flags)) { err = do_follow_link(&next, nd); if (err) goto return_err; |