patch-2.2.8 linux/drivers/scsi/scsi.c

• Lines: 27
• Date: Thu Apr 29 11:53:41 1999
• Orig file: v2.2.7/linux/drivers/scsi/scsi.c
• Orig date: Tue Mar 23 14:35:48 1999

diff -u --recursive --new-file v2.2.7/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -1926,10 +1926,12 @@
     SDpnt->device_queue = NULL;
 
     for(j=0;j<SDpnt->queue_depth;j++){
-      SCpnt = (Scsi_Cmnd *)
+        SCpnt = (Scsi_Cmnd *)
               scsi_init_malloc(sizeof(Scsi_Cmnd),
                                GFP_ATOMIC |
                                (host->unchecked_isa_dma ? GFP_DMA : 0));
+	if (NULL == SCpnt)
+	    break; /* If not, the next line will oops ... */
         memset(&SCpnt->eh_timeout, 0, sizeof(SCpnt->eh_timeout));
 	SCpnt->host                      = host;
 	SCpnt->device                    = SDpnt;
@@ -1951,6 +1953,12 @@
 	SDpnt->device_queue              = SCpnt;
         SCpnt->state                     = SCSI_STATE_UNUSED;
         SCpnt->owner                     = SCSI_OWNER_NOBODY;
+    }
+    if (j < SDpnt->queue_depth) { /* low on space (D.Gilbert 990424) */
+	printk("scsi_build_commandblocks: want=%d, space for=%d blocks\n",
+	       SDpnt->queue_depth, j);
+	SDpnt->queue_depth = j;
+	/* Still problem if 0==j , continue anyway ... */
     }
     SDpnt->has_cmdblocks = 1;
 }