diff options
Diffstat (limited to 'drivers/i2o/i2o_block.c')
| -rw-r--r-- | drivers/i2o/i2o_block.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/i2o/i2o_block.c b/drivers/i2o/i2o_block.c index 8389039d6..857b32a7e 100644 --- a/drivers/i2o/i2o_block.c +++ b/drivers/i2o/i2o_block.c @@ -392,7 +392,6 @@ static inline int i2ob_new_segment(request_queue_t *q, struct request *req, if (req->nr_segments < max_segments) { req->nr_segments++; - q->elevator.nr_segments++; return 1; } return 0; @@ -421,22 +420,16 @@ static int i2ob_merge_requests(request_queue_t *q, { int max_segments = i2ob_dev[MINOR(req->rq_dev)].max_segments; int total_segments = req->nr_segments + next->nr_segments; - int same_segment; if (__max_segments < max_segments) max_segments = __max_segments; - same_segment = 0; if (req->bhtail->b_data + req->bhtail->b_size == next->bh->b_data) - { total_segments--; - same_segment = 1; - } if (total_segments > max_segments) return 0; - q->elevator.nr_segments -= same_segment; req->nr_segments = total_segments; return 1; } |