sysfs: Move all of inode initialization into sysfs_init_inode
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
253280267a
commit
372e88bd19
|
@ -748,24 +748,12 @@ int sysfs_create_dir(struct kobject * kobj)
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sysfs_count_nlink(struct sysfs_dirent *sd)
|
|
||||||
{
|
|
||||||
struct sysfs_dirent *child;
|
|
||||||
int nr = 0;
|
|
||||||
|
|
||||||
for (child = sd->s_children; child; child = child->s_sibling)
|
|
||||||
if (sysfs_type(child) == SYSFS_DIR)
|
|
||||||
nr++;
|
|
||||||
return nr + 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
|
static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
|
||||||
struct nameidata *nd)
|
struct nameidata *nd)
|
||||||
{
|
{
|
||||||
struct dentry *ret = NULL;
|
struct dentry *ret = NULL;
|
||||||
struct sysfs_dirent *parent_sd = dentry->d_parent->d_fsdata;
|
struct sysfs_dirent *parent_sd = dentry->d_parent->d_fsdata;
|
||||||
struct sysfs_dirent *sd;
|
struct sysfs_dirent *sd;
|
||||||
struct bin_attribute *bin_attr;
|
|
||||||
struct inode *inode;
|
struct inode *inode;
|
||||||
|
|
||||||
mutex_lock(&sysfs_mutex);
|
mutex_lock(&sysfs_mutex);
|
||||||
|
@ -785,31 +773,6 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inode->i_state & I_NEW) {
|
|
||||||
/* initialize inode according to type */
|
|
||||||
switch (sysfs_type(sd)) {
|
|
||||||
case SYSFS_DIR:
|
|
||||||
inode->i_op = &sysfs_dir_inode_operations;
|
|
||||||
inode->i_fop = &sysfs_dir_operations;
|
|
||||||
inode->i_nlink = sysfs_count_nlink(sd);
|
|
||||||
break;
|
|
||||||
case SYSFS_KOBJ_ATTR:
|
|
||||||
inode->i_size = PAGE_SIZE;
|
|
||||||
inode->i_fop = &sysfs_file_operations;
|
|
||||||
break;
|
|
||||||
case SYSFS_KOBJ_BIN_ATTR:
|
|
||||||
bin_attr = sd->s_elem.bin_attr.bin_attr;
|
|
||||||
inode->i_size = bin_attr->size;
|
|
||||||
inode->i_fop = &bin_fops;
|
|
||||||
break;
|
|
||||||
case SYSFS_KOBJ_LINK:
|
|
||||||
inode->i_op = &sysfs_symlink_inode_operations;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
BUG();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sysfs_instantiate(dentry, inode);
|
sysfs_instantiate(dentry, inode);
|
||||||
sysfs_attach_dentry(sd, dentry);
|
sysfs_attach_dentry(sd, dentry);
|
||||||
|
|
||||||
|
|
|
@ -122,8 +122,22 @@ static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
|
||||||
*/
|
*/
|
||||||
static struct lock_class_key sysfs_inode_imutex_key;
|
static struct lock_class_key sysfs_inode_imutex_key;
|
||||||
|
|
||||||
|
static int sysfs_count_nlink(struct sysfs_dirent *sd)
|
||||||
|
{
|
||||||
|
struct sysfs_dirent *child;
|
||||||
|
int nr = 0;
|
||||||
|
|
||||||
|
for (child = sd->s_children; child; child = child->s_sibling)
|
||||||
|
if (sysfs_type(child) == SYSFS_DIR)
|
||||||
|
nr++;
|
||||||
|
|
||||||
|
return nr + 2;
|
||||||
|
}
|
||||||
|
|
||||||
static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
|
static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
|
||||||
{
|
{
|
||||||
|
struct bin_attribute *bin_attr;
|
||||||
|
|
||||||
inode->i_blocks = 0;
|
inode->i_blocks = 0;
|
||||||
inode->i_mapping->a_ops = &sysfs_aops;
|
inode->i_mapping->a_ops = &sysfs_aops;
|
||||||
inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
|
inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
|
||||||
|
@ -139,6 +153,37 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
|
||||||
set_inode_attr(inode, sd->s_iattr);
|
set_inode_attr(inode, sd->s_iattr);
|
||||||
} else
|
} else
|
||||||
set_default_inode_attr(inode, sd->s_mode);
|
set_default_inode_attr(inode, sd->s_mode);
|
||||||
|
|
||||||
|
|
||||||
|
/* initialize inode according to type */
|
||||||
|
switch (sysfs_type(sd)) {
|
||||||
|
case SYSFS_ROOT:
|
||||||
|
inode->i_op = &sysfs_dir_inode_operations;
|
||||||
|
inode->i_fop = &sysfs_dir_operations;
|
||||||
|
inc_nlink(inode); /* directory, account for "." */
|
||||||
|
break;
|
||||||
|
case SYSFS_DIR:
|
||||||
|
inode->i_op = &sysfs_dir_inode_operations;
|
||||||
|
inode->i_fop = &sysfs_dir_operations;
|
||||||
|
inode->i_nlink = sysfs_count_nlink(sd);
|
||||||
|
break;
|
||||||
|
case SYSFS_KOBJ_ATTR:
|
||||||
|
inode->i_size = PAGE_SIZE;
|
||||||
|
inode->i_fop = &sysfs_file_operations;
|
||||||
|
break;
|
||||||
|
case SYSFS_KOBJ_BIN_ATTR:
|
||||||
|
bin_attr = sd->s_elem.bin_attr.bin_attr;
|
||||||
|
inode->i_size = bin_attr->size;
|
||||||
|
inode->i_fop = &bin_fops;
|
||||||
|
break;
|
||||||
|
case SYSFS_KOBJ_LINK:
|
||||||
|
inode->i_op = &sysfs_symlink_inode_operations;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
BUG();
|
||||||
|
}
|
||||||
|
|
||||||
|
unlock_new_inode(inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -180,9 +225,6 @@ void sysfs_instantiate(struct dentry *dentry, struct inode *inode)
|
||||||
{
|
{
|
||||||
BUG_ON(!dentry || dentry->d_inode);
|
BUG_ON(!dentry || dentry->d_inode);
|
||||||
|
|
||||||
if (inode->i_state & I_NEW)
|
|
||||||
unlock_new_inode(inode);
|
|
||||||
|
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,11 +49,6 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
inode->i_op = &sysfs_dir_inode_operations;
|
|
||||||
inode->i_fop = &sysfs_dir_operations;
|
|
||||||
inc_nlink(inode); /* directory, account for "." */
|
|
||||||
unlock_new_inode(inode);
|
|
||||||
|
|
||||||
/* instantiate and link root dentry */
|
/* instantiate and link root dentry */
|
||||||
root = d_alloc_root(inode);
|
root = d_alloc_root(inode);
|
||||||
if (!root) {
|
if (!root) {
|
||||||
|
|
Loading…
Reference in a new issue