From: Junxiao Bi <junxiao.bi@oracle.com>
Date: Fri, 20 Nov 2015 23:57:30 +0000 (-0800)
Subject: ocfs2: fix umask ignored issue
X-Git-Tag: v3.16.35~922
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca56574ece3c13f36b2f5366eee22a45e461dbe5;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index a997d7f406084..dbf21ca69ee82 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),