summaryrefslogtreecommitdiffstats
path: root/kernel/fs/autofs4
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fs/autofs4')
-rw-r--r--kernel/fs/autofs4/autofs_i.h5
-rw-r--r--kernel/fs/autofs4/symlink.c5
2 files changed, 2 insertions, 8 deletions
diff --git a/kernel/fs/autofs4/autofs_i.h b/kernel/fs/autofs4/autofs_i.h
index 63cf85daa..4c5413473 100644
--- a/kernel/fs/autofs4/autofs_i.h
+++ b/kernel/fs/autofs4/autofs_i.h
@@ -239,11 +239,6 @@ static inline u64 autofs4_get_ino(struct autofs_sb_info *sbi)
return d_inode(sbi->sb->s_root)->i_ino;
}
-static inline int simple_positive(struct dentry *dentry)
-{
- return d_really_is_positive(dentry) && !d_unhashed(dentry);
-}
-
static inline void __autofs4_add_expiring(struct dentry *dentry)
{
struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
diff --git a/kernel/fs/autofs4/symlink.c b/kernel/fs/autofs4/symlink.c
index de58cc7b8..da0c33481 100644
--- a/kernel/fs/autofs4/symlink.c
+++ b/kernel/fs/autofs4/symlink.c
@@ -12,14 +12,13 @@
#include "autofs_i.h"
-static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
+static const char *autofs4_follow_link(struct dentry *dentry, void **cookie)
{
struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
struct autofs_info *ino = autofs4_dentry_ino(dentry);
if (ino && !autofs4_oz_mode(sbi))
ino->last_used = jiffies;
- nd_set_link(nd, d_inode(dentry)->i_private);
- return NULL;
+ return d_inode(dentry)->i_private;
}
const struct inode_operations autofs4_symlink_inode_operations = {