svcrpc: treat uid's as unsigned

[safe/jmp/linux-2.6] / fs / sysfs / file.c

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index f5ea468..dc30d9e 100644 (file)
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -579,46 +579,23 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group);
  */
 int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode)
 {
-       struct sysfs_dirent *victim_sd = NULL;
-       struct dentry *victim = NULL;
-       struct inode * inode;
+       struct sysfs_dirent *sd;
        struct iattr newattrs;
        int rc;
 
-       rc = -ENOENT;
-       victim_sd = sysfs_get_dirent(kobj->sd, attr->name);
-       if (!victim_sd)
-               goto out;
+       mutex_lock(&sysfs_mutex);
 
-       mutex_lock(&sysfs_rename_mutex);
-       victim = sysfs_get_dentry(victim_sd);
-       mutex_unlock(&sysfs_rename_mutex);
-       if (IS_ERR(victim)) {
-               rc = PTR_ERR(victim);
-               victim = NULL;
+       rc = -ENOENT;
+       sd = sysfs_find_dirent(kobj->sd, attr->name);
+       if (!sd)
                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 | ATTR_CTIME;
-       newattrs.ia_ctime = current_fs_time(inode->i_sb);
-       rc = sysfs_setattr(victim, &newattrs);
+       newattrs.ia_mode = (mode & S_IALLUGO) | (sd->s_mode & ~S_IALLUGO);
+       newattrs.ia_valid = ATTR_MODE;
+       rc = sysfs_sd_setattr(sd, &newattrs);
 
-       if (rc == 0) {
-               fsnotify_change(victim, newattrs.ia_valid);
-               mutex_lock(&sysfs_mutex);
-               victim_sd->s_mode = newattrs.ia_mode;
-               mutex_unlock(&sysfs_mutex);
-       }
-
-       mutex_unlock(&inode->i_mutex);
  out:
-       dput(victim);
-       sysfs_put(victim_sd);
+       mutex_unlock(&sysfs_mutex);
        return rc;
 }
 EXPORT_SYMBOL_GPL(sysfs_chmod_file);