Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 726a5e06 authored by Al Viro's avatar Al Viro
Browse files

autofs4: autofs4_get_inode() doesn't need autofs_info * argument anymore 



Acked-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0bf71d4d

fs/autofs4/autofs_i.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ static inline int autofs4_ispending(struct dentry *dentry) 
	return 0;

	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 *);

void autofs4_free_ino(struct autofs_info *);





/* Expiration */

/* Expiration */

fs/autofs4/inode.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -259,7 +259,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	ino = autofs4_init_ino(NULL, sbi);

	ino = autofs4_init_ino(NULL, sbi);

	if (!ino)

	if (!ino)

		goto fail_free;

		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)

	if (!root_inode)

		goto fail_ino;

		goto fail_ino;
@@ -342,9 +342,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	return -EINVAL;

	return -EINVAL;

}

}





struct inode *autofs4_get_inode(struct super_block *sb,

struct inode *autofs4_get_inode(struct super_block *sb, mode_t mode)

				struct autofs_info *inf,

				mode_t mode)

{

{

	struct inode *inode = new_inode(sb);

	struct inode *inode = new_inode(sb);

fs/autofs4/root.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -554,7 +554,7 @@ static int autofs4_dir_symlink(struct inode *dir, 




	strcpy(cp, symname);

	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) {

	if (!inode) {

		kfree(cp);

		kfree(cp);

		if (!dentry->d_fsdata)

		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);

	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 (!inode) {

		if (!dentry->d_fsdata)

		if (!dentry->d_fsdata)

			kfree(ino);

			kfree(ino);