Skip to content

Commit

Permalink
autofs4: autofs4_get_inode() doesn't need autofs_info * argument anymore
Browse files Browse the repository at this point in the history
Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 18, 2011
1 parent 0bf71d4 commit 726a5e0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion fs/autofs4/autofs_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
6 changes: 2 additions & 4 deletions fs/autofs4/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions fs/autofs4/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 726a5e0

Please sign in to comment.