---

yaml --- r: 231789 b: refs/heads/master c: 726a5e0 h: refs/heads/master i: 231787: d0a3677 v: v3
git-mirror · Jan 18, 2011 · af744b8 · af744b8
1 parent 0efaf70
commit af744b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf71d4d005176f6b6587ba64a377f9798213f21
+refs/heads/master: 726a5e0688fd344110d8f2979d87f243a4ba1a48
diff --git a/trunk/fs/autofs4/autofs_i.h b/trunk/fs/autofs4/autofs_i.h
@@ -167,7 +167,7 @@ static inline int autofs4_ispending(struct dentry *dentry)
 	return 0;
 }
 
-struct inode *autofs4_get_inode(struct super_block *, struct autofs_info *, mode_t);
+struct inode *autofs4_get_inode(struct super_block *, mode_t);
 void autofs4_free_ino(struct autofs_info *);
 
 /* Expiration */

diff --git a/trunk/fs/autofs4/inode.c b/trunk/fs/autofs4/inode.c
@@ -259,7 +259,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
 	ino = autofs4_init_ino(NULL, sbi);
 	if (!ino)
 		goto fail_free;
-	root_inode = autofs4_get_inode(s, ino, S_IFDIR | 0755);
+	root_inode = autofs4_get_inode(s, S_IFDIR | 0755);
 	if (!root_inode)
 		goto fail_ino;
 
@@ -342,9 +342,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
 	return -EINVAL;
 }
 
-struct inode *autofs4_get_inode(struct super_block *sb,
-				struct autofs_info *inf,
-				mode_t mode)
+struct inode *autofs4_get_inode(struct super_block *sb, mode_t mode)
 {
 	struct inode *inode = new_inode(sb);
 

diff --git a/trunk/fs/autofs4/root.c b/trunk/fs/autofs4/root.c
@@ -554,7 +554,7 @@ static int autofs4_dir_symlink(struct inode *dir,
 
 	strcpy(cp, symname);
 
-	inode = autofs4_get_inode(dir->i_sb, ino, S_IFLNK | 0555);
+	inode = autofs4_get_inode(dir->i_sb, S_IFLNK | 0555);
 	if (!inode) {
 		kfree(cp);
 		if (!dentry->d_fsdata)
@@ -740,7 +740,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 
 	autofs4_del_active(dentry);
 
-	inode = autofs4_get_inode(dir->i_sb, ino, S_IFDIR | 0555);
+	inode = autofs4_get_inode(dir->i_sb, S_IFDIR | 0555);
 	if (!inode) {
 		if (!dentry->d_fsdata)
 			kfree(ino);