Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118504
b: refs/heads/master
c: 2920ebb
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Jens Axboe committed Nov 6, 2008
1 parent 963114c commit 3d3d0c2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f92131c3dd567fc6df18ce3f46fcf57ecbdefbe0
refs/heads/master: 2920ebbd65f3e80c318adf5191ac0987142bda80
12 changes: 6 additions & 6 deletions trunk/block/elevator.c
Original file line number Diff line number Diff line change
Expand Up @@ -773,12 +773,6 @@ struct request *elv_next_request(struct request_queue *q)
*/
rq->cmd_flags |= REQ_STARTED;
blk_add_trace_rq(q, rq, BLK_TA_ISSUE);

/*
* We are now handing the request to the hardware,
* add the timeout handler
*/
blk_add_timer(rq);
}

if (!q->boundary_rq || q->boundary_rq == rq) {
Expand Down Expand Up @@ -850,6 +844,12 @@ void elv_dequeue_request(struct request_queue *q, struct request *rq)
*/
if (blk_account_rq(rq))
q->in_flight++;

/*
* We are now handing the request to the hardware, add the
* timeout handler.
*/
blk_add_timer(rq);
}
EXPORT_SYMBOL(elv_dequeue_request);

Expand Down

0 comments on commit 3d3d0c2

Please sign in to comment.