diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-09 12:04:19 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-09 13:23:02 -0800 |
| commit | 3150a73366b64e3109f0facbc98bcacbc14e81ba (patch) | |
| tree | 2b94b32c5fe97a4e76058a6f65e8c5717b53ee16 /fs/io-wq.c | |
| parent | 1a2fb220edca98d18f90e3ef5bd6853a6b22b1b8 (diff) | |
| parent | ded746bfc94398d2ee9de315a187677b207b2004 (diff) | |
| download | linux-3150a73366b64e3109f0facbc98bcacbc14e81ba.tar.gz linux-3150a73366b64e3109f0facbc98bcacbc14e81ba.tar.bz2 linux-3150a73366b64e3109f0facbc98bcacbc14e81ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/io-wq.c')
| -rw-r--r-- | fs/io-wq.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/io-wq.c b/fs/io-wq.c index 88202de519f6..50cf9f92da36 100644 --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -714,6 +714,13 @@ static bool io_wq_work_match_all(struct io_wq_work *work, void *data) static inline bool io_should_retry_thread(long err) { + /* + * Prevent perpetual task_work retry, if the task (or its group) is + * exiting. + */ + if (fatal_signal_pending(current)) + return false; + switch (err) { case -EAGAIN: case -ERESTARTSYS: |