adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sysfs: In sysfs_chmod_file lazily propagate the mode change.

Browse source 
Now that sysfs_getattr and sysfs_permission refresh the vfs
inode there is no need to immediatly push the mode change
into the vfs cache.  Reducing the amount of work needed and
simplifying the locking.

Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Eric W. Biederman 2009-11-20 16:08:54 -08:00 committed by Greg Kroah-Hartman
parent e61ab4ae48
commit 06fc0d66f7
1 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/sysfs/file.c
View file

@ -579,38 +579,23 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group);
*/ */
int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode) int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode)
{ {
struct sysfs_dirent *victim_sd = NULL; struct sysfs_dirent *sd;
struct dentry *victim = NULL;
struct inode * inode;
struct iattr newattrs; struct iattr newattrs;
int rc; int rc;
mutex_lock(&sysfs_mutex);
rc = -ENOENT; rc = -ENOENT;
victim_sd = sysfs_get_dirent(kobj->sd, attr->name); sd = sysfs_find_dirent(kobj->sd, attr->name);
if (!victim_sd) if (!sd)
goto out; goto out;
mutex_lock(&sysfs_rename_mutex); newattrs.ia_mode = (mode & S_IALLUGO) | (sd->s_mode & ~S_IALLUGO);
victim = sysfs_get_dentry(victim_sd);
mutex_unlock(&sysfs_rename_mutex);
if (IS_ERR(victim)) {
rc = PTR_ERR(victim);
victim = NULL;
goto out;
}
inode = victim->d_inode;
mutex_lock(&inode->i_mutex);
newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
newattrs.ia_valid = ATTR_MODE; newattrs.ia_valid = ATTR_MODE;
rc = sysfs_setattr(victim, &newattrs); rc = sysfs_sd_setattr(sd, &newattrs);
mutex_unlock(&inode->i_mutex);
out: out:
dput(victim); mutex_unlock(&sysfs_mutex);
sysfs_put(victim_sd);
return rc; return rc;
} }
EXPORT_SYMBOL_GPL(sysfs_chmod_file); EXPORT_SYMBOL_GPL(sysfs_chmod_file);