diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-01 12:29:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-01 12:29:49 -0800 |
| commit | dc3e24b214c50a2ac2dd3d2cc7fb88c9a1e842d4 (patch) | |
| tree | 409f5c4f7f009dba45c7a6bee9514ffb48003b8d /kernel | |
| parent | depmod: handle the case of /sbin/depmod without /sbin in PATH (diff) | |
| parent | kernel/io_uring: cancel io_uring before task works (diff) | |
| download | linux-dev-dc3e24b214c50a2ac2dd3d2cc7fb88c9a1e842d4.tar.xz linux-dev-dc3e24b214c50a2ac2dd3d2cc7fb88c9a1e842d4.zip | |
Merge tag 'io_uring-5.11-2021-01-01' of git://git.kernel.dk/linux-block
Pull io_uring fixes from Jens Axboe:
"A few fixes that should go into 5.11, all marked for stable as well:
- Fix issue around identity COW'ing and users that share a ring
across processes
- Fix a hang associated with unregistering fixed files (Pavel)
- Move the 'process is exiting' cancelation a bit earlier, so
task_works aren't affected by it (Pavel)"
* tag 'io_uring-5.11-2021-01-01' of git://git.kernel.dk/linux-block:
kernel/io_uring: cancel io_uring before task works
io_uring: fix io_sqe_files_unregister() hangs
io_uring: add a helper for setting a ref node
io_uring: don't assume mm is constant across submits
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 3594291a8542..04029e35e69a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -63,6 +63,7 @@ #include <linux/random.h> #include <linux/rcuwait.h> #include <linux/compat.h> +#include <linux/io_uring.h> #include <linux/uaccess.h> #include <asm/unistd.h> @@ -776,6 +777,7 @@ void __noreturn do_exit(long code) schedule(); } + io_uring_files_cancel(tsk->files); exit_signals(tsk); /* sets PF_EXITING */ /* sync mm's RSS info before statistics gathering */ |