diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-07 13:00:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-07 13:00:23 -0700 |
| commit | 8ef9c292ac7bf91fc0367746cf5db264adddced9 (patch) | |
| tree | 61ab727e8d0fa4bf058c0d914b95e9f40d1ede33 /fs/open.c | |
| parent | e4ef108fcde0b97ed38923ba1ea06c7a152bab9e (diff) | |
| parent | 3d62c45b38e534262d443b5820fb06a0e6d0d42f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: add missing check for __O_TMPFILE in fcntl_init()
fs: Allow unprivileged linkat(..., AT_EMPTY_PATH) aka flink
fs: Fix file mode for O_TMPFILE
reiserfs: fix deadlock in umount
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index d53e2989508..7931f76acc2 100644 --- a/fs/open.c +++ b/fs/open.c @@ -823,7 +823,7 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *o int lookup_flags = 0; int acc_mode; - if (flags & O_CREAT) + if (flags & (O_CREAT | __O_TMPFILE)) op->mode = (mode & S_IALLUGO) | S_IFREG; else op->mode = 0; |