summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-02-15 16:51:55 +0100
committerJiri Slaby <jslaby@suse.cz>2016-02-15 16:51:55 +0100
commit9d7b13540116fa3727a081b122b4714d50eb6cdf (patch)
tree1ede311d51bf00a867eecd8f0b3cac66a5ffdfe1
parent6316a3e99fc7a48af3d2ccabb11806c4d4d61c0b (diff)
downloadlwn-9d7b13540116fa3727a081b122b4714d50eb6cdf.tar.gz
lwn-9d7b13540116fa3727a081b122b4714d50eb6cdf.zip
Revert "ocfs2: fix umask ignored issue"
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@suse.cz>
-rw-r--r--fs/ocfs2/namei.c2
1 files changed, 0 insertions, 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),