---

yaml --- r: 118505 b: refs/heads/master c: e78042e h: refs/heads/master i: 118503: 963114c v: v3
git-mirror · Nov 6, 2008 · 6ac10a2 · 6ac10a2
1 parent 3d3d0c2
commit 6ac10a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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