openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

configfs: move d_rehash() into configfs_create() for regular files 

... and turn it into d_add in there

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-03-07 14:25:46 -05:00
parent f7380af04b
commit 5cf3b560af
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/configfs/dir.c
View File

@ -432,14 +432,9 @@ static int configfs_attach_attr(struct configfs_dirent * sd, struct dentry * den
(sd->s_type & CONFIGFS_ITEM_BIN_ATTR) ? (sd->s_type & CONFIGFS_ITEM_BIN_ATTR) ?
configfs_init_bin_file : configfs_init_bin_file :
configfs_init_file); configfs_init_file);
if (error) { if (error)
configfs_put(sd); configfs_put(sd);
return error; return error;
}
d_rehash(dentry);
return 0;
} }
static struct dentry * configfs_lookup(struct inode *dir, static struct dentry * configfs_lookup(struct inode *dir,

12
fs/configfs/inode.c
View File

@ -199,9 +199,17 @@ int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct in
configfs_set_inode_lock_class(sd, inode); configfs_set_inode_lock_class(sd, inode);
init(inode); init(inode);
d_instantiate(dentry, inode); if (S_ISDIR(mode) || S_ISLNK(mode)) {
if (S_ISDIR(mode) || S_ISLNK(mode)) /*
* ->symlink(), ->mkdir(), configfs_register_subsystem() or
* create_default_group() - already hashed.
*/
d_instantiate(dentry, inode);
dget(dentry); /* pin link and directory dentries in core */ dget(dentry); /* pin link and directory dentries in core */
} else {
/* ->lookup() */
d_add(dentry, inode);
}
return error; return error;
} }