diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-16 17:13:33 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-18 01:21:27 -0500 |
commit | 14a2f00bde7668fe18d1c8355d26c7c96961e1f7 (patch) | |
tree | c14da20ae3c32474c52d49bec43e046b583b8d9d /fs | |
parent | 292c5ee802e9b969b84ee671a5e3001d94230f5b (diff) |
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')
-rw-r--r-- | fs/autofs4/inode.c | 13 |
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, | |||
215 | return (*pipefd < 0); | 215 | return (*pipefd < 0); |
216 | } | 216 | } |
217 | 217 | ||
218 | static struct autofs_info *autofs4_mkroot(struct autofs_sb_info *sbi) | ||
219 | { | ||
220 | struct autofs_info *ino; | ||
221 | |||
222 | ino = autofs4_init_ino(NULL, sbi, S_IFDIR | 0755); | ||
223 | if (!ino) | ||
224 | return NULL; | ||
225 | |||
226 | return ino; | ||
227 | } | ||
228 | |||
229 | int autofs4_fill_super(struct super_block *s, void *data, int silent) | 218 | int autofs4_fill_super(struct super_block *s, void *data, int silent) |
230 | { | 219 | { |
231 | struct inode * root_inode; | 220 | struct inode * root_inode; |
@@ -269,7 +258,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) | |||
269 | /* | 258 | /* |
270 | * Get the root inode and dentry, but defer checking for errors. | 259 | * Get the root inode and dentry, but defer checking for errors. |
271 | */ | 260 | */ |
272 | ino = autofs4_mkroot(sbi); | 261 | ino = autofs4_init_ino(NULL, sbi, S_IFDIR | 0755); |
273 | if (!ino) | 262 | if (!ino) |
274 | goto fail_free; | 263 | goto fail_free; |
275 | root_inode = autofs4_get_inode(s, ino); | 264 | root_inode = autofs4_get_inode(s, ino); |