patch-2.2.16 linux/drivers/scsi/sd.c

Next file: linux/drivers/scsi/sd_ioctl.c
Previous file: linux/drivers/scsi/scsi.c
Back to the patch index
Back to the overall index

diff -urN v2.2.15/linux/drivers/scsi/sd.c linux/drivers/scsi/sd.c
@@ -999,7 +999,7 @@
 	if(block & 7) panic("sd.c:Bad block number requested");
 	if(this_count & 7) panic("sd.c:Bad block number requested");
 	block = block >> 3;
-	this_count = block >> 3;
+	this_count = this_count >> 3;
      }
 
      if (rscsi_disks[dev].sector_size == 2048){
@@ -1381,7 +1381,7 @@
 	    }
 	}
 
-        if( rscsi_disks[i].sector_size == 2048 )
+        if( rscsi_disks[i].sector_size > 1024 )
           {
             int m;
 
@@ -1393,7 +1393,7 @@
              */
             for (m=i<<4; m<((i+1)<<4); m++)
               {
-                sd_blocksizes[m] = 2048;
+                sd_blocksizes[m] = rscsi_disks[i].sector_size;
               }
           }
     {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)