mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: make unplug timer trace event correspond to the schedule() unplug block: let io_schedule() flush the plug inline
This commit is contained in:
commit
d733ed6c34
5 changed files with 45 additions and 19 deletions
|
|
@ -871,6 +871,14 @@ static inline void blk_flush_plug(struct task_struct *tsk)
|
|||
{
|
||||
struct blk_plug *plug = tsk->plug;
|
||||
|
||||
if (plug)
|
||||
blk_flush_plug_list(plug, false);
|
||||
}
|
||||
|
||||
static inline void blk_schedule_flush_plug(struct task_struct *tsk)
|
||||
{
|
||||
struct blk_plug *plug = tsk->plug;
|
||||
|
||||
if (plug)
|
||||
blk_flush_plug_list(plug, true);
|
||||
}
|
||||
|
|
@ -1317,6 +1325,11 @@ static inline void blk_flush_plug(struct task_struct *task)
|
|||
{
|
||||
}
|
||||
|
||||
static inline void blk_schedule_flush_plug(struct task_struct *task)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
static inline bool blk_needs_flush_plug(struct task_struct *tsk)
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue