diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-01-14 16:49:31 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-27 11:12:31 +0100 |
| commit | 5b04d92a330f43e854fdde9d83b936033ef0ab77 (patch) | |
| tree | 68854ba86163178526d0131244838f257a7a83fa | |
| parent | 3651a9ffb0b883b19db053e6324e7c427ff50eef (diff) | |
| download | kgraft-5b04d92a330f43e854fdde9d83b936033ef0ab77.tar.gz | |
kgr: mark task_safe in non-upstream kthreads
Some kthreads were removed post-4.4. This patch serves them.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/infiniband/ulp/srpt/ib_srpt.c | 1 | ||||
| -rw-r--r-- | fs/notify/mark.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 2e2fe818ca9f1a..66061e122047ec 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -2059,6 +2059,7 @@ static int srpt_compl_thread(void *arg) while (!kthread_should_stop()) { wait_event_interruptible(ch->wait_queue, (srpt_process_completion(ch->cq, ch), + klp_kgraft_mark_task_safe(current), kthread_should_stop())); } pr_info("Session %s: kernel thread %s (PID %d) stopped\n", diff --git a/fs/notify/mark.c b/fs/notify/mark.c index fc0df4442f7b45..e48b24e1e5b6f7 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c @@ -511,7 +511,9 @@ static int fsnotify_mark_destroy(void *ignored) fsnotify_put_mark(mark); } - wait_event_interruptible(destroy_waitq, !list_empty(&destroy_list)); + wait_event_interruptible(destroy_waitq, ({ + klp_kgraft_mark_task_safe(current); + !list_empty(&destroy_list); })); } return 0; |