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

Commit 09f12c03 authored by Al Viro's avatar Al Viro
Browse files

autofs4: pass mode to autofs4_get_inode() explicitly 



In all cases we'd set inf->mode to know value just before
passing it to autofs4_get_inode().  That kills the need
to store it in autofs_info and pass it to autofs_init_ino()

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

fs/autofs4/autofs_i.h

+2 −3
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ struct autofs_info { 
	uid_t uid;

	gid_t gid;



	mode_t	mode;

	size_t	size;

};
@@ -170,7 +169,7 @@ static inline int autofs4_ispending(struct dentry *dentry) 
	return 0;

}



struct inode *autofs4_get_inode(struct super_block *, struct autofs_info *);

struct inode *autofs4_get_inode(struct super_block *, struct autofs_info *, mode_t);

void autofs4_free_ino(struct autofs_info *);



/* Expiration */
@@ -280,7 +279,7 @@ static inline void managed_dentry_clear_managed(struct dentry *dentry) 
/* Initializing function */



int autofs4_fill_super(struct super_block *, void *, int);

struct autofs_info *autofs4_init_ino(struct autofs_info *, struct autofs_sb_info *sbi, mode_t mode);

struct autofs_info *autofs4_init_ino(struct autofs_info *, struct autofs_sb_info *sbi);



/* Queue management functions */

fs/autofs4/inode.c

+8 −8
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/module.h>



struct autofs_info *autofs4_init_ino(struct autofs_info *ino,

				     struct autofs_sb_info *sbi, mode_t mode)

				     struct autofs_sb_info *sbi)

{

	int reinit = 1;
@@ -47,7 +47,6 @@ struct autofs_info *autofs4_init_ino(struct autofs_info *ino, 


	ino->uid = 0;

	ino->gid = 0;

	ino->mode = mode;

	ino->last_used = jiffies;



	ino->sbi = sbi;
@@ -258,10 +257,10 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	/*

	 * Get the root inode and dentry, but defer checking for errors.

	 */

	ino = autofs4_init_ino(NULL, sbi, S_IFDIR | 0755);

	ino = autofs4_init_ino(NULL, sbi);

	if (!ino)

		goto fail_free;

	root_inode = autofs4_get_inode(s, ino);

	root_inode = autofs4_get_inode(s, ino, S_IFDIR | 0755);

	if (!root_inode)

		goto fail_ino;
@@ -345,14 +344,15 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
}



struct inode *autofs4_get_inode(struct super_block *sb,

				struct autofs_info *inf)

				struct autofs_info *inf,

				mode_t mode)

{

	struct inode *inode = new_inode(sb);



	if (inode == NULL)

		return NULL;



	inode->i_mode = inf->mode;

	inode->i_mode = mode;

	if (sb->s_root) {

		inode->i_uid = sb->s_root->d_inode->i_uid;

		inode->i_gid = sb->s_root->d_inode->i_gid;
@@ -360,11 +360,11 @@ struct inode *autofs4_get_inode(struct super_block *sb, 
	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

	inode->i_ino = get_next_ino();



	if (S_ISDIR(inf->mode)) {

	if (S_ISDIR(mode)) {

		inode->i_nlink = 2;

		inode->i_op = &autofs4_dir_inode_operations;

		inode->i_fop = &autofs4_dir_operations;

	} else if (S_ISLNK(inf->mode)) {

	} else if (S_ISLNK(mode)) {

		inode->i_size = inf->size;

		inode->i_op = &autofs4_symlink_inode_operations;

	}

fs/autofs4/root.c

+5 −5
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s 
		if (autofs_type_indirect(sbi->type) && IS_ROOT(dentry->d_parent))

			__managed_dentry_set_managed(dentry);



		ino = autofs4_init_ino(NULL, sbi, 0555);

		ino = autofs4_init_ino(NULL, sbi);

		if (!ino)

			return ERR_PTR(-ENOMEM);
@@ -538,7 +538,7 @@ static int autofs4_dir_symlink(struct inode *dir, 
	if (!autofs4_oz_mode(sbi))

		return -EACCES;



	ino = autofs4_init_ino(ino, sbi, S_IFLNK | 0555);

	ino = autofs4_init_ino(ino, sbi);

	if (!ino)

		return -ENOMEM;
@@ -554,7 +554,7 @@ static int autofs4_dir_symlink(struct inode *dir, 


	strcpy(cp, symname);



	inode = autofs4_get_inode(dir->i_sb, ino);

	inode = autofs4_get_inode(dir->i_sb, ino, S_IFLNK | 0555);

	if (!inode) {

		kfree(cp);

		if (!dentry->d_fsdata)
@@ -733,13 +733,13 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
	DPRINTK("dentry %p, creating %.*s",

		dentry, dentry->d_name.len, dentry->d_name.name);



	ino = autofs4_init_ino(ino, sbi, S_IFDIR | 0555);

	ino = autofs4_init_ino(ino, sbi);

	if (!ino)

		return -ENOMEM;



	autofs4_del_active(dentry);



	inode = autofs4_get_inode(dir->i_sb, ino);

	inode = autofs4_get_inode(dir->i_sb, ino, S_IFDIR | 0555);

	if (!inode) {

		if (!dentry->d_fsdata)

			kfree(ino);