summaryrefslogtreecommitdiff
path: root/fs/ocfs2/namei.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-11-25 23:47:38 +0100
committerArnd Bergmann <arnd@arndb.de>2015-11-25 23:47:38 +0100
commitd3de94ba4e58e8043d500f7335797d6a2ac93248 (patch)
tree8382a170965eec00ebfe62e7b42dfdea9ca44f54 /fs/ocfs2/namei.c
parentfabc2c9c1ff5376489e83e142f1ab236609435b1 (diff)
parent1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff)
Merge tag 'v4.4-rc2' into fixes
Linux 4.4-rc2 is backmerged from the keystone fixes.
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 3b48ac25d8a7..a03f6f433075 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -372,6 +372,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),