sysfs: fix locking in sysfs_lookup() and sysfs_rename_dir()
sd children list walking in sysfs_lookup() and sd renaming in sysfs_rename_dir() were left out during i_mutex -> sysfs_mutex conversion. Fix them. Signed-off-by: Tejun Heo <htejun@gmail.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
74e8f346d5
commit
6cb52147b2
|
@ -762,12 +762,15 @@ static int sysfs_count_nlink(struct sysfs_dirent *sd)
|
||||||
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 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 bin_attribute *bin_attr;
|
||||||
struct inode *inode;
|
struct inode *inode;
|
||||||
int found = 0;
|
int found = 0;
|
||||||
|
|
||||||
|
mutex_lock(&sysfs_mutex);
|
||||||
|
|
||||||
for (sd = parent_sd->s_children; sd; sd = sd->s_sibling) {
|
for (sd = parent_sd->s_children; sd; sd = sd->s_sibling) {
|
||||||
if (sysfs_type(sd) &&
|
if (sysfs_type(sd) &&
|
||||||
!strcmp(sd->s_name, dentry->d_name.name)) {
|
!strcmp(sd->s_name, dentry->d_name.name)) {
|
||||||
|
@ -778,14 +781,14 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
|
||||||
|
|
||||||
/* no such entry */
|
/* no such entry */
|
||||||
if (!found)
|
if (!found)
|
||||||
return NULL;
|
goto out_unlock;
|
||||||
|
|
||||||
/* attach dentry and inode */
|
/* attach dentry and inode */
|
||||||
inode = sysfs_get_inode(sd);
|
inode = sysfs_get_inode(sd);
|
||||||
if (!inode)
|
if (!inode) {
|
||||||
return ERR_PTR(-ENOMEM);
|
ret = ERR_PTR(-ENOMEM);
|
||||||
|
goto out_unlock;
|
||||||
mutex_lock(&sysfs_mutex);
|
}
|
||||||
|
|
||||||
if (inode->i_state & I_NEW) {
|
if (inode->i_state & I_NEW) {
|
||||||
/* initialize inode according to type */
|
/* initialize inode according to type */
|
||||||
|
@ -815,9 +818,9 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
|
||||||
sysfs_instantiate(dentry, inode);
|
sysfs_instantiate(dentry, inode);
|
||||||
sysfs_attach_dentry(sd, dentry);
|
sysfs_attach_dentry(sd, dentry);
|
||||||
|
|
||||||
|
out_unlock:
|
||||||
mutex_unlock(&sysfs_mutex);
|
mutex_unlock(&sysfs_mutex);
|
||||||
|
return ret;
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct inode_operations sysfs_dir_inode_operations = {
|
const struct inode_operations sysfs_dir_inode_operations = {
|
||||||
|
@ -942,6 +945,8 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
|
||||||
if (error)
|
if (error)
|
||||||
goto out_drop;
|
goto out_drop;
|
||||||
|
|
||||||
|
mutex_lock(&sysfs_mutex);
|
||||||
|
|
||||||
dup_name = sd->s_name;
|
dup_name = sd->s_name;
|
||||||
sd->s_name = new_name;
|
sd->s_name = new_name;
|
||||||
|
|
||||||
|
@ -949,8 +954,6 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
|
||||||
d_add(new_dentry, NULL);
|
d_add(new_dentry, NULL);
|
||||||
d_move(sd->s_dentry, new_dentry);
|
d_move(sd->s_dentry, new_dentry);
|
||||||
|
|
||||||
mutex_lock(&sysfs_mutex);
|
|
||||||
|
|
||||||
sysfs_unlink_sibling(sd);
|
sysfs_unlink_sibling(sd);
|
||||||
sysfs_get(new_parent_sd);
|
sysfs_get(new_parent_sd);
|
||||||
sysfs_put(sd->s_parent);
|
sysfs_put(sd->s_parent);
|
||||||
|
|
Loading…
Reference in a new issue