From: Junxiao Bi Date: Mon, 7 Dec 2015 03:00:34 +0000 (+0800) Subject: ocfs2: fix SGID not inherited issue X-Git-Tag: v4.1.12-92~220^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bc54f60ec876afecbde6c17fb35f0e62b8e47807;p=users%2Fjedix%2Flinux-maple.git ocfs2: fix SGID not inherited issue Oracle-bug: 22311520 commit 8f1eb48758aa ("ocfs2: fix umask ignored issue") introduced an issue, SGID of sub dir was not inherited from its parents dir. It is because SGID is set into "inode->i_mode" in ocfs2_get_init_inode(), but is overwritten by "mode" which don't have SGID set later. Fixes: 8f1eb48758aa ("ocfs2: fix umask ignored issue") Signed-off-by: Junxiao Bi Cc: Acked-by: Srinivas Eeda --- diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index ee593e11cdb2b..94ed099bf1018 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -360,13 +360,11 @@ static int ocfs2_mknod(struct inode *dir, goto leave; } - status = posix_acl_create(dir, &mode, &default_acl, &acl); + status = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl); if (status) { 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),