summaryrefslogtreecommitdiffstats
path: root/fs/autofs4
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-01-16 17:13:33 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-18 01:21:27 -0500
commit14a2f00bde7668fe18d1c8355d26c7c96961e1f7 (patch)
treec14da20ae3c32474c52d49bec43e046b583b8d9d /fs/autofs4
parent292c5ee802e9b969b84ee671a5e3001d94230f5b (diff)
downloadlinux-14a2f00bde7668fe18d1c8355d26c7c96961e1f7.tar.gz
linux-14a2f00bde7668fe18d1c8355d26c7c96961e1f7.tar.bz2
linux-14a2f00bde7668fe18d1c8355d26c7c96961e1f7.zip
autofs4: autofs4_mkroot() is not different from autofs4_init_ino()
Kill it. Mind you, it's been an obfuscated call of autofs4_init_ino() ever since 2.3.99pre6-4... Acked-by: Ian Kent <raven@themaw.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4')
-rw-r--r--fs/autofs4/inode.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index cf8abc793d50..7421b47b1bb9 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -215,17 +215,6 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
return (*pipefd < 0);
}
-static struct autofs_info *autofs4_mkroot(struct autofs_sb_info *sbi)
-{
- struct autofs_info *ino;
-
- ino = autofs4_init_ino(NULL, sbi, S_IFDIR | 0755);
- if (!ino)
- return NULL;
-
- return ino;
-}
-
int autofs4_fill_super(struct super_block *s, void *data, int silent)
{
struct inode * root_inode;
@@ -269,7 +258,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
/*
* Get the root inode and dentry, but defer checking for errors.
*/
- ino = autofs4_mkroot(sbi);
+ ino = autofs4_init_ino(NULL, sbi, S_IFDIR | 0755);
if (!ino)
goto fail_free;
root_inode = autofs4_get_inode(s, ino);