Commit 3b704d3f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Redundant unplug_timer deletion

From: "Chen, Kenneth W" <kenneth.w.chen@intel.com>

The only path to get to del_timer call in __generic_unplug_device() is when
blk_remove_plug() returns 1, and in that case it already removed the
unplug_timer.

Patch to remove this redundant call.
parent 0eaf393b
...@@ -1141,8 +1141,6 @@ static inline void __generic_unplug_device(request_queue_t *q) ...@@ -1141,8 +1141,6 @@ static inline void __generic_unplug_device(request_queue_t *q)
if (!blk_remove_plug(q)) if (!blk_remove_plug(q))
return; return;
del_timer(&q->unplug_timer);
/* /*
* was plugged, fire request_fn if queue has stuff to do * was plugged, fire request_fn if queue has stuff to do
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment