From f17130c1ddcf028c23f43e3659a5430ede913e35 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 1 Nov 2007 16:27:38 -0400 Subject: [PATCH] --- yaml --- r: 84193 b: refs/heads/master c: 857013b87b6e0fea776c1f0b365dbce3d6eba8c6 h: refs/heads/master i: 84191: cc2b1c57ea398ffbe2ca53ed55cd5c1b03d1ccd7 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/fs.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b4116a32790e..77f1a077a93e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15953580e79b58caefb107e77f218e009b9992e6 +refs/heads/master: 857013b87b6e0fea776c1f0b365dbce3d6eba8c6 diff --git a/trunk/fs/jffs2/fs.c b/trunk/fs/jffs2/fs.c index d2e06f7ea96f..ee192af0b8b0 100644 --- a/trunk/fs/jffs2/fs.c +++ b/trunk/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);