diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
| commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
| tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /fs/sysfs/inode.c | |
| parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'fs/sysfs/inode.c')
| -rw-r--r-- | fs/sysfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index 8de13bafaa76..d727dc960634 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c | |||
| @@ -85,7 +85,7 @@ int sysfs_setattr(struct dentry * dentry, struct iattr * iattr) | |||
| 85 | 85 | ||
| 86 | if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID)) | 86 | if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID)) |
| 87 | mode &= ~S_ISGID; | 87 | mode &= ~S_ISGID; |
| 88 | sd_iattr->ia_mode = mode; | 88 | sd_iattr->ia_mode = sd->s_mode = mode; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | return error; | 91 | return error; |