[LV-k25-commit] CVS: kernel-2.5/drivers/scsi scsi_ioctl.c,1.3,1.4 scsi_merge.c,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv31851/drivers/scsi

Modified Files:
	scsi_ioctl.c scsi_merge.c 
Log Message:
Merge with Linus' 2.5.2 release


Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scsi_ioctl.c	31 May 2002 01:58:39 -0000	1.3
+++ scsi_ioctl.c	5 Jun 2002 21:55:04 -0000	1.4
@@ -4,7 +4,6 @@
  * - get rid of some verify_areas and use __copy*user and __get/put_user
  *   for the ones that remain
  */
-#define __NO_VERSION__
 #include <linux/module.h>
 
 #include <asm/io.h>

Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scsi_merge.c	31 May 2002 01:58:39 -0000	1.2
+++ scsi_merge.c	5 Jun 2002 21:55:04 -0000	1.3
@@ -15,7 +15,6 @@
  * be handled all at once by a host adapter.
  */
 
-#define __NO_VERSION__
 #include <linux/config.h>
 #include <linux/module.h>
 
@@ -59,12 +58,10 @@
  */
 int scsi_init_io(Scsi_Cmnd *SCpnt)
 {
-	struct request     *req;
+	struct request     *req = &SCpnt->request;
 	struct scatterlist *sgpnt;
 	int count, gfp_mask;
 
-	req = &SCpnt->request;
-
 	/*
 	 * First we need to know how many scatter gather segments are needed.
 	 */
@@ -85,14 +82,13 @@
 	BUG_ON(!sgpnt);
 
 	SCpnt->request_buffer = (char *) sgpnt;
-	SCpnt->request_bufflen = 0;
+	SCpnt->request_bufflen = req->nr_sectors << 9;
 	req->buffer = NULL;
 
 	/* 
 	 * Next, walk the list, and fill in the addresses and sizes of
 	 * each segment.
 	 */
-	SCpnt->request_bufflen = req->nr_sectors << 9;
 	count = blk_rq_map_sg(req->q, req, SCpnt->request_buffer);
 
 	/*
@@ -144,8 +140,7 @@
 		else
 			bounce_limit = SHpnt->pci_dev->dma_mask;
 #endif
-	}
-	if (SHpnt->unchecked_isa_dma)
+	} else if (SHpnt->unchecked_isa_dma)
 		bounce_limit = BLK_BOUNCE_ISA;
 
 	blk_queue_bounce_limit(q, bounce_limit);