patch-2.4.1 linux/drivers/i2o/i2o_block.c

• Lines: 31
• Date: Sun Jan 28 13:37:18 2001
• Orig file: v2.4.0/linux/drivers/i2o/i2o_block.c
• Orig date: Wed Nov 8 17:09:50 2000

diff -u --recursive --new-file v2.4.0/linux/drivers/i2o/i2o_block.c linux/drivers/i2o/i2o_block.c
@@ -392,7 +392,6 @@
 
 	if (req->nr_segments < max_segments) {
 		req->nr_segments++;
-		q->elevator.nr_segments++;
 		return 1;
 	}
 	return 0;
@@ -421,22 +420,16 @@
 {
 	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;
 }