diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-19 14:10:49 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-19 14:10:49 +0300 |
| commit | 01438749e36bfe53ea25c91568019be775a9782e (patch) | |
| tree | f91f5abae2004863afda683589d034dcd2000ab8 /include/linux/io_uring.h | |
| parent | 4faf62b1ef1a9367f7dcf8b7ce509980dfdcee83 (diff) | |
| parent | bee645788e07eea63055d261d2884ea45c2ba857 (diff) | |
| download | linux-01438749e36bfe53ea25c91568019be775a9782e.tar.xz | |
Merge branch 'locking/urgent' into locking/core, to pick up dependent commits
We are applying further, lower-prio fixes on top of two ww_mutex fixes in locking/urgent.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/io_uring.h')
| -rw-r--r-- | include/linux/io_uring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h index 7cb7bd0e334c..9761a0ec9f95 100644 --- a/include/linux/io_uring.h +++ b/include/linux/io_uring.h @@ -18,7 +18,7 @@ struct io_uring_task { /* submission side */ struct xarray xa; struct wait_queue_head wait; - struct file *last; + void *last; void *io_wq; struct percpu_counter inflight; atomic_t in_idle; |