diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-27 14:36:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-27 14:36:14 +0100 |
| commit | 1004a2505f28f7d5ff9e7f7042a30da082c6aff8 (patch) | |
| tree | 218c4f812f06452ae39e1850ae1c305ca0375902 /fs | |
| parent | 009da28929f8dceb81c27dcfd6222b3e1c655509 (diff) | |
| parent | 5c20b6ab59580182b3179aa33403a14738873c72 (diff) | |
| download | linux-next-1004a2505f28f7d5ff9e7f7042a30da082c6aff8.tar.gz linux-next-1004a2505f28f7d5ff9e7f7042a30da082c6aff8.zip | |
Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/aio.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1402,7 +1402,7 @@ static long read_events(struct kioctx *ctx, long min_nr, long nr, w.min_nr = min_nr - ret; ret2 = prepare_to_wait_event(&ctx->wait, &w.w, TASK_INTERRUPTIBLE); - if (!ret2 && !t.task) + if (!ret2 && !hrtimer_sleeper_task_get(&t)) ret2 = -ETIME; if (aio_read_events(ctx, min_nr, nr, event, &ret) || ret2) |