]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
autofs4: autofs4_mkroot() is not different from autofs4_init_ino()
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 16 Jan 2011 22:13:33 +0000 (17:13 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 18 Jan 2011 06:21:27 +0000 (01:21 -0500)
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>
fs/autofs4/inode.c

index cf8abc793d5051c4e8f0db5a3db2613c02b18377..7421b47b1bb96b332f67e1fab107af3e335ef009 100644 (file)
@@ -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);