diff options
| author | Brian Behlendorf <[email protected]> | 2017-07-23 19:32:14 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-07-23 19:32:14 -0700 |
| commit | 944117514d2aba081b15faad741e7d0c6b1465c8 (patch) | |
| tree | 242f2062a1aa5654ad4e6f13cea7bda60eb29106 /module/spl | |
| parent | ae42190b7917d5aaa8ec0c0951ff65e8df6fa601 (diff) | |
Linux 4.13 compat: wait queues
Commit torvalds/linux@ac6424b9
- Renamed struct wait_queue -> struct wait_queue_entry.
Commit torvalds/linux@2055da97
- Renamed wait_queue_head::task_list -> wait_queue_head::head
- Renamed wait_queue_entry::task_list -> wait_queue_entry::entry
Reviewed-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #629
Diffstat (limited to 'module/spl')
| -rw-r--r-- | module/spl/spl-proc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c index bffbcc607..05c1a5dbc 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c @@ -244,7 +244,7 @@ taskq_seq_show_impl(struct seq_file *f, void *p, boolean_t allflag) { taskq_t *tq = p; taskq_thread_t *tqt; - wait_queue_t *wq; + spl_wait_queue_entry_t *wq; struct task_struct *tsk; taskq_ent_t *tqe; char name[100]; @@ -261,7 +261,11 @@ taskq_seq_show_impl(struct seq_file *f, void *p, boolean_t allflag) lheads[LHEAD_PEND] = &tq->tq_pend_list; lheads[LHEAD_PRIO] = &tq->tq_prio_list; lheads[LHEAD_DELAY] = &tq->tq_delay_list; +#ifdef HAVE_WAIT_QUEUE_HEAD_ENTRY + lheads[LHEAD_WAIT] = &tq->tq_wait_waitq.head; +#else lheads[LHEAD_WAIT] = &tq->tq_wait_waitq.task_list; +#endif lheads[LHEAD_ACTIVE] = &tq->tq_active_list; for (i = 0; i < LHEAD_SIZE; ++i) { @@ -320,7 +324,13 @@ taskq_seq_show_impl(struct seq_file *f, void *p, boolean_t allflag) } /* show the wait waitq list */ if (i == LHEAD_WAIT) { - wq = list_entry(lh, wait_queue_t, task_list); +#ifdef HAVE_WAIT_QUEUE_HEAD_ENTRY + wq = list_entry(lh, + spl_wait_queue_entry_t, entry); +#else + wq = list_entry(lh, + spl_wait_queue_entry_t, task_list); +#endif if (j == 0) seq_printf(f, "\t%s:", list_names[i]); |