aboutsummaryrefslogtreecommitdiffstats
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)
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 0925bacb5c3c..8f15162f1672 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)
167 return 0; 167 return 0;
168} 168}
169 169
170struct inode *autofs4_get_inode(struct super_block *, struct autofs_info *, mode_t); 170struct inode *autofs4_get_inode(struct super_block *, mode_t);
171void autofs4_free_ino(struct autofs_info *); 171void autofs4_free_ino(struct autofs_info *);
172 172
173/* Expiration */ 173/* Expiration */
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index ac1a99ce820b..b3f9477c9745 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)
259 ino = autofs4_init_ino(NULL, sbi); 259 ino = autofs4_init_ino(NULL, sbi);
260 if (!ino) 260 if (!ino)
261 goto fail_free; 261 goto fail_free;
262 root_inode = autofs4_get_inode(s, ino, S_IFDIR | 0755); 262 root_inode = autofs4_get_inode(s, S_IFDIR | 0755);
263 if (!root_inode) 263 if (!root_inode)
264 goto fail_ino; 264 goto fail_ino;
265 265
@@ -342,9 +342,7 @@ fail_unlock:
342 return -EINVAL; 342 return -EINVAL;
343} 343}
344 344
345struct inode *autofs4_get_inode(struct super_block *sb, 345struct inode *autofs4_get_inode(struct super_block *sb, mode_t mode)
346 struct autofs_info *inf,
347 mode_t mode)
348{ 346{
349 struct inode *inode = new_inode(sb); 347 struct inode *inode = new_inode(sb);
350 348
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 1ad3c6ca9b03..83e5379c5ade 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -554,7 +554,7 @@ static int autofs4_dir_symlink(struct inode *dir,
554 554
555 strcpy(cp, symname); 555 strcpy(cp, symname);
556 556
557 inode = autofs4_get_inode(dir->i_sb, ino, S_IFLNK | 0555); 557 inode = autofs4_get_inode(dir->i_sb, S_IFLNK | 0555);
558 if (!inode) { 558 if (!inode) {
559 kfree(cp); 559 kfree(cp);
560 if (!dentry->d_fsdata) 560 if (!dentry->d_fsdata)
@@ -740,7 +740,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
740 740
741 autofs4_del_active(dentry); 741 autofs4_del_active(dentry);
742 742
743 inode = autofs4_get_inode(dir->i_sb, ino, S_IFDIR | 0555); 743 inode = autofs4_get_inode(dir->i_sb, S_IFDIR | 0555);
744 if (!inode) { 744 if (!inode) {
745 if (!dentry->d_fsdata) 745 if (!dentry->d_fsdata)
746 kfree(ino); 746 kfree(ino);