This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== This reverts commit e1f20b83cc2d70aafb060e302564f968d2da9d43, upstream commit 8f1eb48758aacf6c1ffce18179295adbf3bd7640. This commit fixes 702e5bc ("ocfs2: use generic posix ACL infrastructure"), which is only in 3.14. So this commit should have never been applied to 3.12 and it can cause sgid inheritance issues. Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> --- fs/ocfs2/namei.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 9523fcd86c31..c19c2c57650b 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -330,8 +330,6 @@ static int ocfs2_mknod(struct inode *dir, mlog_errno(status); goto leave; } - /* update inode->i_mode after mask with "umask". */ - inode->i_mode = mode; handle = ocfs2_start_trans(osb, ocfs2_mknod_credits(osb->sb, S_ISDIR(mode), -- 2.7.1 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html