diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-11-01 16:27:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-11-01 16:27:38 -0400 |
| commit | 857013b87b6e0fea776c1f0b365dbce3d6eba8c6 (patch) | |
| tree | aab7410481a2e45d73bc7483c16ea9d17c91aecd /fs/jffs2/fs.c | |
| parent | 15953580e79b58caefb107e77f218e009b9992e6 (diff) | |
| download | linux-857013b87b6e0fea776c1f0b365dbce3d6eba8c6.tar.gz linux-857013b87b6e0fea776c1f0b365dbce3d6eba8c6.tar.bz2 linux-857013b87b6e0fea776c1f0b365dbce3d6eba8c6.zip | |
[JFFS2] Don't strip sgid bit from inode permissions
<viro> dwmw2: anyway, removing sgid from directories or from
files without S_IXGRP is a plain and simple bug
<viro> these days you don't need that logics at all - simply remove it
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/fs.c')
| -rw-r--r-- | fs/jffs2/fs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index d2e06f7ea96f..ee192af0b8b0 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -97,11 +97,7 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr) ri->gid = cpu_to_je16((ivalid & ATTR_GID)?iattr->ia_gid:inode->i_gid); if (ivalid & ATTR_MODE) - if (iattr->ia_mode & S_ISGID && - !in_group_p(je16_to_cpu(ri->gid)) && !capable(CAP_FSETID)) - ri->mode = cpu_to_jemode(iattr->ia_mode & ~S_ISGID); - else - ri->mode = cpu_to_jemode(iattr->ia_mode); + ri->mode = cpu_to_jemode(iattr->ia_mode); else ri->mode = cpu_to_jemode(inode->i_mode); |