diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-19 15:13:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-19 15:13:04 -0700 |
commit | c6256ca9c011db79cca6b7a3a659389ff217e0bd (patch) | |
tree | 68c08077361b67b4e2eed09b4f32c74e8926c242 | |
parent | 0d707a2f24c4a962313cffc980e2d74df460e45a (diff) | |
parent | 6417250d3f894e66a68ba1cd93676143f2376a6f (diff) | |
download | op-kernel-dev-c6256ca9c011db79cca6b7a3a659389ff217e0bd.zip op-kernel-dev-c6256ca9c011db79cca6b7a3a659389ff217e0bd.tar.gz |
Merge branch 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fixes from Tejun Heo:
"Two low-impact workqueue commits.
One fixes workqueue creation error path and the other removes the
unused cancel_work()"
* 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: remove unused cancel_work()
workqueue: use put_device() instead of kfree()
-rw-r--r-- | include/linux/workqueue.h | 1 | ||||
-rw-r--r-- | kernel/workqueue.c | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index bc0cda1..0c33014 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -456,7 +456,6 @@ extern int schedule_on_each_cpu(work_func_t func); int execute_in_process_context(work_func_t fn, struct execute_work *); extern bool flush_work(struct work_struct *work); -extern bool cancel_work(struct work_struct *work); extern bool cancel_work_sync(struct work_struct *work); extern bool flush_delayed_work(struct delayed_work *dwork); diff --git a/kernel/workqueue.c b/kernel/workqueue.c index bb9a519..6ec6ba6 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3018,14 +3018,6 @@ static bool __cancel_work(struct work_struct *work, bool is_dwork) return ret; } -/* - * See cancel_delayed_work() - */ -bool cancel_work(struct work_struct *work) -{ - return __cancel_work(work, false); -} - /** * cancel_delayed_work - cancel a delayed work * @dwork: delayed_work to cancel @@ -5337,7 +5329,7 @@ int workqueue_sysfs_register(struct workqueue_struct *wq) ret = device_register(&wq_dev->dev); if (ret) { - kfree(wq_dev); + put_device(&wq_dev->dev); wq->wq_dev = NULL; return ret; } |