summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/namei.c
diff options
context:
space:
mode:
authorJunxiao Bi <junxiao.bi@oracle.com>2015-11-20 15:57:30 -0800
committerLuis Henriques <luis.henriques@canonical.com>2015-12-14 10:17:11 +0000
commitca56574ece3c13f36b2f5366eee22a45e461dbe5 (patch)
treea381aa3a2cf03261d00bd64d3bf050b0af906afb /fs/ocfs2/namei.c
parentdf313e158181ee0425d0c40c0ca6fb5fa887fbbe (diff)
downloadlinux-stable-ca56574ece3c13f36b2f5366eee22a45e461dbe5.tar.gz
linux-stable-ca56574ece3c13f36b2f5366eee22a45e461dbe5.tar.bz2
linux-stable-ca56574ece3c13f36b2f5366eee22a45e461dbe5.zip
ocfs2: fix umask ignored issue
commit 8f1eb48758aacf6c1ffce18179295adbf3bd7640 upstream. New created file's mode is not masked with umask, and this makes umask not work for ocfs2 volume. Fixes: 702e5bc ("ocfs2: use generic posix ACL infrastructure") Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> Cc: Gang He <ghe@suse.com> Cc: Mark Fasheh <mfasheh@suse.de> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/ocfs2/namei.c')
-rw-r--r--fs/ocfs2/namei.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index a997d7f40608..dbf21ca69ee8 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -361,6 +361,8 @@ 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),