diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-14 08:14:50 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-14 08:14:50 -0700 |
| commit | 080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047 (patch) | |
| tree | 2a367e97dcffe9ced54ff71b03ab893a3248fdb4 /fs/open.c | |
| parent | e91f24ae027a583f2faff84456fa2630144bfed8 (diff) | |
| parent | 39c41df9c1950fba0ee6a4e7a63be281e89fe437 (diff) | |
Merge branch 'zynq/dt' into next/dt
* zynq/dt: (1054 commits)
arm: zynq: dt: Set correct L2 ram latencies
+ v3.11-rc5
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index 9156cb050d08..7931f76acc2b 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; @@ -844,6 +844,8 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *o if ((flags & O_TMPFILE_MASK) != O_TMPFILE) return -EINVAL; acc_mode = MAY_OPEN | ACC_MODE(flags); + if (!(acc_mode & MAY_WRITE)) + return -EINVAL; } else if (flags & O_PATH) { /* * If we have O_PATH in the open flag. Then we |