Commit aae8dda5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'wq-for-6.0-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull workqueue fix from Tejun Heo:
 "Just one patch to improve flush lockdep coverage"

* tag 'wq-for-6.0-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: don't skip lockdep work dependency in cancel_work_sync()
parents 3db61221 c0feea59

kernel/workqueue.c

+2 −4
Original line number Diff line number Diff line
@@ -3066,10 +3066,8 @@ static bool __flush_work(struct work_struct *work, bool from_cancel) 
	if (WARN_ON(!work->func))

		return false;



	if (!from_cancel) {

	lock_map_acquire(&work->lockdep_map);

	lock_map_release(&work->lockdep_map);

	}



	if (start_flush_work(work, &barr, from_cancel)) {

		wait_for_completion(&barr.done);