diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 01:45:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 01:45:56 +0100 |
| commit | feaf3848a813a106f163013af6fcf6c4bfec92d9 (patch) | |
| tree | a5b2db24fa361e96efb64442f48e463154a66f8b /block/elevator.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| parent | block: fix setting of max_segment_size and seg_boundary mask (diff) | |
| download | linux-feaf3848a813a106f163013af6fcf6c4bfec92d9.tar.xz linux-feaf3848a813a106f163013af6fcf6c4bfec92d9.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: fix setting of max_segment_size and seg_boundary mask
block: internal dequeue shouldn't start timer
block: set disk->node_id before it's being used
When block layer fails to map iov, it calls bio_unmap_user to undo
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/block/elevator.c b/block/elevator.c index 9ac82dde99dd..a6951f76ba0c 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -844,14 +844,7 @@ 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); int elv_queue_empty(struct request_queue *q) { |