---

yaml --- r: 231786 b: refs/heads/master c: 14a2f00 h: refs/heads/master v: v3
git-mirror · Jan 18, 2011 · d8e8578 · d8e8578
1 parent f6218ef
commit d8e8578
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 292c5ee802e9b969b84ee671a5e3001d94230f5b
+refs/heads/master: 14a2f00bde7668fe18d1c8355d26c7c96961e1f7
diff --git a/trunk/fs/autofs4/inode.c b/trunk/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);