dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

autofs4: split autofs4_init_ino() 

split init_ino into new_ino and clean_ino; the former is
what used to be init_ino(NULL, sbi), the latter is for cases
where we passed non-NULL ino.  Lose unused arguments.

Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-01-16 18:43:40 -05:00
parent 5a37db302e
commit 26e6c91067
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/autofs4/autofs_i.h
View File

@ -277,7 +277,8 @@ 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);
struct autofs_info *autofs4_new_ino(struct autofs_sb_info *);
void autofs4_clean_ino(struct autofs_info *);
/* Queue management functions */

32
fs/autofs4/inode.c
View File

@ -22,35 +22,23 @@
#include "autofs_i.h"
#include <linux/module.h>
struct autofs_info *autofs4_init_ino(struct autofs_info *ino,
struct autofs_sb_info *sbi)
struct autofs_info *autofs4_new_ino(struct autofs_sb_info *sbi)
{
int reinit = 1;
if (ino == NULL) {
reinit = 0;
ino = kmalloc(sizeof(*ino), GFP_KERNEL);
}
if (ino == NULL)
return NULL;
if (!reinit) {
ino->flags = 0;
ino->dentry = NULL;
struct autofs_info *ino = kzalloc(sizeof(*ino), GFP_KERNEL);
if (ino) {
INIT_LIST_HEAD(&ino->active);
ino->active_count = 0;
INIT_LIST_HEAD(&ino->expiring);
atomic_set(&ino->count, 0);
ino->last_used = jiffies;
ino->sbi = sbi;
}
return ino;
}
void autofs4_clean_ino(struct autofs_info *ino)
{
ino->uid = 0;
ino->gid = 0;
ino->last_used = jiffies;
ino->sbi = sbi;
return ino;
}
void autofs4_free_ino(struct autofs_info *ino)
@ -256,7 +244,7 @@ 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);
ino = autofs4_new_ino(sbi);
if (!ino)
goto fail_free;
root_inode = autofs4_get_inode(s, S_IFDIR | 0755);

6
fs/autofs4/root.c
View File

@ -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);
ino = autofs4_new_ino(sbi);
if (!ino)
return ERR_PTR(-ENOMEM);
@ -541,7 +541,7 @@ static int autofs4_dir_symlink(struct inode *dir,
BUG_ON(!ino);
autofs4_init_ino(ino, sbi);
autofs4_clean_ino(ino);
autofs4_del_active(dentry);
@ -732,7 +732,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
BUG_ON(!ino);
autofs4_init_ino(ino, sbi);
autofs4_clean_ino(ino);
autofs4_del_active(dentry);