patch-2.3.99-pre1 linux/drivers/scsi/scsi_merge.c

• Lines: 36
• Date: Sun Mar 12 19:32:58 2000
• Orig file: v2.3.51/linux/drivers/scsi/scsi_merge.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.51/linux/drivers/scsi/scsi_merge.c linux/drivers/scsi/scsi_merge.c
@@ -324,7 +324,7 @@
 	    req->nr_segments >= SHpnt->sg_tablesize)
 		return 0;
 	req->nr_segments++;
-	q->nr_segments++;
+	q->elevator.nr_segments++;
 	return 1;
 }
 
@@ -346,7 +346,7 @@
 		return 0;
 	req->nr_hw_segments++;
 	req->nr_segments++;
-	q->nr_segments++;
+	q->elevator.nr_segments++;
 	return 1;
 }
 #else
@@ -362,7 +362,7 @@
 		 * counter.
 		 */
 		req->nr_segments++;
-		q->nr_segments++;
+		q->elevator.nr_segments++;
 		return 1;
 	} else {
 		return 0;
@@ -665,7 +665,7 @@
 			 * This one is OK.  Let it go.
 			 */
 			req->nr_segments += next->nr_segments - 1;
-			q->nr_segments--;
+			q->elevator.nr_segments--;
 #ifdef DMA_CHUNK_SIZE
 			req->nr_hw_segments += next->nr_hw_segments - 1;
 #endif