diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:27:23 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:27:23 +0800 |
| commit | 039b7fca24dba50c09e60b23494ba3c4d19aac7d (patch) | |
| tree | 72467db481226700794c993368537e32a4564533 /fs/ocfs2/namei.c | |
| parent | 9f41e6b222c4a04c7b46068df82842a6188b4a57 (diff) | |
| parent | 07cc49f66973f49a391c91bf4b158fa0f2562ca8 (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1
Merge tag 'v4.1.15' into of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v4.1
Diffstat (limited to 'fs/ocfs2/namei.c')
| -rw-r--r-- | fs/ocfs2/namei.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 176fe6afd94e..4d5e0a573f4f 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -365,6 +365,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), |