diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-11 22:06:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-11 22:06:51 +0300 |
| commit | 2e40ed24e1696e47e94e804d09ef88ecb6617201 (patch) | |
| tree | 0bfaad67ce53882dedabd881cc07c35b7af301fe /io_uring/openclose.c | |
| parent | 9106536c1aa37bcf60202ad93bb8b94bcd29f3f0 (diff) | |
| parent | 56675f8b9f9b15b024b8e3145fa289b004916ab7 (diff) | |
| download | linux-2e40ed24e1696e47e94e804d09ef88ecb6617201.tar.xz | |
Merge tag 'io_uring-6.5-2023-08-11' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
"A followup fix for the parisc/SHM_COLOUR fix, also from Helge, which
is heading to stable.
And then just the io_uring equivalent of the RESOLVE_CACHED fix in
commit a0fc452a5d7f from last week for build_open_flags()"
* tag 'io_uring-6.5-2023-08-11' of git://git.kernel.dk/linux:
io_uring/parisc: Adjust pgoff in io_uring mmap() for parisc
io_uring: correct check for O_TMPFILE
Diffstat (limited to 'io_uring/openclose.c')
| -rw-r--r-- | io_uring/openclose.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/io_uring/openclose.c b/io_uring/openclose.c index 10ca57f5bd24..e3fae26e025d 100644 --- a/io_uring/openclose.c +++ b/io_uring/openclose.c @@ -35,9 +35,11 @@ static bool io_openat_force_async(struct io_open *open) { /* * Don't bother trying for O_TRUNC, O_CREAT, or O_TMPFILE open, - * it'll always -EAGAIN + * it'll always -EAGAIN. Note that we test for __O_TMPFILE because + * O_TMPFILE includes O_DIRECTORY, which isn't a flag we need to force + * async for. */ - return open->how.flags & (O_TRUNC | O_CREAT | O_TMPFILE); + return open->how.flags & (O_TRUNC | O_CREAT | __O_TMPFILE); } static int __io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) |