[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.

diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 6d9cb580bf6341676746d13910b9fd3564e118a2..7066fef79596ef6ede7f065347d7a5e99dfedbfe 100644 (file)
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -1141,8 +1141,6 @@ static inline void __generic_unplug_device(request_queue_t *q)
        if (!blk_remove_plug(q))
                return;
 
-       del_timer(&q->unplug_timer);
-
        /*
         * was plugged, fire request_fn if queue has stuff to do
         */