summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-01-16 17:43:52 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-18 01:21:28 -0500
commit726a5e0688fd344110d8f2979d87f243a4ba1a48 (patch)
treec554b40ff5619dfd491b4890e89c8ee9c3131efd /fs
parent0bf71d4d005176f6b6587ba64a377f9798213f21 (diff)
downloadop-kernel-dev-726a5e0688fd344110d8f2979d87f243a4ba1a48.zip
op-kernel-dev-726a5e0688fd344110d8f2979d87f243a4ba1a48.tar.gz
autofs4: autofs4_get_inode() doesn't need autofs_info * argument anymore
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/autofs_i.h2
-rw-r--r--fs/autofs4/inode.c6
-rw-r--r--fs/autofs4/root.c4
3 files changed, 5 insertions, 7 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index 0925bac..8f15162 100644
--- a/fs/autofs4/autofs_i.h
+++ b/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/fs/autofs4/inode.c b/fs/autofs4/inode.c
index ac1a99c..b3f9477 100644
--- a/fs/autofs4/inode.c
+++ b/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 @@ fail_unlock:
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/fs/autofs4/root.c b/fs/autofs4/root.c
index 1ad3c6c..83e5379 100644
--- a/fs/autofs4/root.c
+++ b/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);
OpenPOWER on IntegriCloud