Commit 37b1ef31 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Tejun Heo
Browse files

workqueue: move flush_scheduled_work() to workqueue.h 



flush_scheduled_work() is just a simple call to flush_work().

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 899a94fe

include/linux/workqueue.h

+29 −1
Original line number Diff line number Diff line
@@ -435,7 +435,6 @@ extern bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq, 


extern void flush_workqueue(struct workqueue_struct *wq);

extern void drain_workqueue(struct workqueue_struct *wq);

extern void flush_scheduled_work(void);



extern int schedule_on_each_cpu(work_func_t func);
@@ -531,6 +530,35 @@ static inline bool schedule_work(struct work_struct *work) 
	return queue_work(system_wq, work);

}



/**

 * flush_scheduled_work - ensure that any scheduled work has run to completion.

 *

 * Forces execution of the kernel-global workqueue and blocks until its

 * completion.

 *

 * Think twice before calling this function!  It's very easy to get into

 * trouble if you don't take great care.  Either of the following situations

 * will lead to deadlock:

 *

 *	One of the work items currently on the workqueue needs to acquire

 *	a lock held by your code or its caller.

 *

 *	Your code is running in the context of a work routine.

 *

 * They will be detected by lockdep when they occur, but the first might not

 * occur very often.  It depends on what work items are on the workqueue and

 * what locks they need, which you have no control over.

 *

 * In most situations flushing the entire workqueue is overkill; you merely

 * need to know that a particular work item isn't queued and isn't running.

 * In such cases you should use cancel_delayed_work_sync() or

 * cancel_work_sync() instead.

 */

static inline void flush_scheduled_work(void)

{

	flush_workqueue(system_wq);

}



/**

 * schedule_delayed_work_on - queue work in global workqueue on CPU after delay

 * @cpu: cpu to use

kernel/workqueue.c

+0 −30
Original line number Diff line number Diff line
@@ -2958,36 +2958,6 @@ int schedule_on_each_cpu(work_func_t func) 
	return 0;

}



/**

 * flush_scheduled_work - ensure that any scheduled work has run to completion.

 *

 * Forces execution of the kernel-global workqueue and blocks until its

 * completion.

 *

 * Think twice before calling this function!  It's very easy to get into

 * trouble if you don't take great care.  Either of the following situations

 * will lead to deadlock:

 *

 *	One of the work items currently on the workqueue needs to acquire

 *	a lock held by your code or its caller.

 *

 *	Your code is running in the context of a work routine.

 *

 * They will be detected by lockdep when they occur, but the first might not

 * occur very often.  It depends on what work items are on the workqueue and

 * what locks they need, which you have no control over.

 *

 * In most situations flushing the entire workqueue is overkill; you merely

 * need to know that a particular work item isn't queued and isn't running.

 * In such cases you should use cancel_delayed_work_sync() or

 * cancel_work_sync() instead.

 */

void flush_scheduled_work(void)

{

	flush_workqueue(system_wq);

}

EXPORT_SYMBOL(flush_scheduled_work);



/**

 * execute_in_process_context - reliably execute the routine with user context

 * @fn:		the function to execute