diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 19:45:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 19:45:56 -0500 |
commit | feaf3848a813a106f163013af6fcf6c4bfec92d9 (patch) | |
tree | a5b2db24fa361e96efb64442f48e463154a66f8b /block/elevator.c | |
parent | a771132783d3f78a51597fdcee96c6dfbae3512e (diff) | |
parent | 0e435ac26e3f951d83338ed3d4ab7dc0fe0055bc (diff) |
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) | |||
844 | */ | 844 | */ |
845 | if (blk_account_rq(rq)) | 845 | if (blk_account_rq(rq)) |
846 | q->in_flight++; | 846 | q->in_flight++; |
847 | |||
848 | /* | ||
849 | * We are now handing the request to the hardware, add the | ||
850 | * timeout handler. | ||
851 | */ | ||
852 | blk_add_timer(rq); | ||
853 | } | 847 | } |
854 | EXPORT_SYMBOL(elv_dequeue_request); | ||
855 | 848 | ||
856 | int elv_queue_empty(struct request_queue *q) | 849 | int elv_queue_empty(struct request_queue *q) |
857 | { | 850 | { |