From 6ac10a22554af7dbd0d647d3fef2a5fb979c1882 Mon Sep 17 00:00:00 2001 From: Mike Anderson Date: Thu, 30 Oct 2008 02:16:20 -0700 Subject: [PATCH] --- yaml --- r: 118505 b: refs/heads/master c: e78042e5b83936b1d12a4b5bbb492bdd88ad76c6 h: refs/heads/master i: 118503: 963114c05e532ad4743911de2f5fc4ff860c03ae v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 08a6d0eda28c..c5f6747f864f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2920ebbd65f3e80c318adf5191ac0987142bda80 +refs/heads/master: e78042e5b83936b1d12a4b5bbb492bdd88ad76c6 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index c3df30cfb3fc..10e8a64a5a5b 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -1770,8 +1770,6 @@ static void end_that_request_last(struct request *req, int error) { struct gendisk *disk = req->rq_disk; - blk_delete_timer(req); - if (blk_rq_tagged(req)) blk_queue_end_tag(req->q, req); @@ -1781,6 +1779,8 @@ static void end_that_request_last(struct request *req, int error) if (unlikely(laptop_mode) && blk_fs_request(req)) laptop_io_completion(); + blk_delete_timer(req); + /* * Account IO completion. bar_rq isn't accounted as a normal * IO on queueing nor completion. Accounting the containing