ieee1394/sbp2.c doesn't compile in 2.5.45

PATCH Miles Lane 2 participants 2 messages Nov 1, 2002 SCSI

lore

Share & tools

lore

Miles Lane

author

2002-11-01 00:55 UTC #0 lore raw

Quoted 3 lines · Douglas

Adrian,
Could you try this patch that I sent to the scsi
list against 2.5.44-bk3.

Yes, this patch fixed the 2.5.45 compile for me.

Miles

Quoted 31 lines

drivers/ieee1394/sbp2.h2544bk3fix renamed from drivers/ieee1394/sbp2.h +2 -1

@@ -552,7 +552,8 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
 static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]);
 #else
-static int sbp2scsi_biosparam (Scsi_Disk *disk, struct block_device *dev, int geom[]);
+static int sbp2scsi_biosparam (struct scsi_device *sdev, 
+			struct block_device *dev, sector_t capacy, int geom[]);
 #endif
 static int sbp2scsi_abort (Scsi_Cmnd *SCpnt); 
 static int sbp2scsi_reset (Scsi_Cmnd *SCpnt);

drivers/ieee1394/sbp2.c2544bk3fix renamed from drivers/ieee1394/sbp2.c +3 -3

@@ -3137,14 +3137,14 @@
 /*
  * Called by scsi stack to get bios parameters (used by fdisk, and at boot).
  */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,43)
 static int sbp2scsi_biosparam (struct scsi_device *sdev,
-		struct block_device *dev, sector_t capacy, int geom[]) 
+		struct block_device *dev, sector_t capacity, int geom[]) 
 {
 #else
 static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]) 
 {
-	sector_t capacy = disk->capacity;
+	sector_t capacity = disk->capacity;
 #endif
 	int heads, sectors, cylinders;

Douglas Gilbert

2002-11-01 02:03 UTC #1 lore raw

Quoted 37 lines · Miles Lane

Quoted 3 lines · Douglas
Adrian,
Could you try this patch that I sent to the scsi
list against 2.5.44-bk3.
Yes, this patch fixed the 2.5.45 compile for me.
Miles
Quoted 25 lines
drivers/ieee1394/sbp2.h2544bk3fix 2002-10-31 renamed from drivers/ieee1394/sbp2.h 2002-10-26 03:11:32.000000000 +1000 +0 -0
11:27:25.000000000 +1100
drivers/ieee1394/sbp2.h2544bk3fix 2002-10-31 renamed from drivers/ieee1394/sbp2.h 2002-10-26 03:11:32.000000000 +1000 +1 -1
@@ -552,7 +552,8 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
 static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]);
 #else
-static int sbp2scsi_biosparam (Scsi_Disk *disk, struct block_device 
 *dev, int geom[]);
+static int sbp2scsi_biosparam (struct scsi_device *sdev, +            
 struct block_device *dev, sector_t capacy, int geom[]);
 #endif
 static int sbp2scsi_abort (Scsi_Cmnd *SCpnt);  static int 
sbp2scsi_reset (Scsi_Cmnd *SCpnt); --- linux/drivers/ieee1394/sbp2.c 2002-10-31 09:22:50.000000000 +1100
+++ linux/drivers/ieee1394/sbp2.c2544bk3fix 2002-10-31
11:30:20.000000000 +1100
drivers/ieee1394/sbp2.h2544bk3fix 2002-10-31 renamed from drivers/ieee1394/sbp2.h 2002-10-26 03:11:32.000000000 +1000 +0 -0
@@ -3137,14 +3137,14 @@
 /*
  * Called by scsi stack to get bios parameters (used by fdisk, and at 
boot).
*/
drivers/ieee1394/sbp2.h2544bk3fix 2002-10-31 renamed from drivers/ieee1394/sbp2.h 2002-10-26 03:11:32.000000000 +1000 +1 -2
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,43)
 static int sbp2scsi_biosparam (struct scsi_device *sdev,
-        struct block_device *dev, sector_t capacy, int geom[]) 

Quoted 8 lines

drivers/ieee1394/sbp2.h2544bk3fix 2002-10-31
Quoted 8 lines
+ struct block_device *dev, sector_t capacity, int geom[]) {
#else
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int
geom[]) {
drivers/ieee1394/sbp2.h2544bk3fix 2002-10-31 renamed from drivers/ieee1394/sbp2.h 2002-10-26 03:11:32.000000000 +1000 +1 -1
-    sector_t capacy = disk->capacity;
+    sector_t capacity = disk->capacity;
 #endif
     int heads, sectors, cylinders;

Attached is a slightly cleaner version of the this patch. My 1394 disk enclosure hasn't caught up with me yet. Can someone confirm whether 1394 sbp2 devices work with 2.5.45

Doug Gilbert

drivers/ieee1394/sbp2.h2545fix renamed from drivers/ieee1394/sbp2.h +2 -1

@@ -552,7 +552,8 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
 static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]);
 #else
-static int sbp2scsi_biosparam (Scsi_Disk *disk, struct block_device *dev, int geom[]);
+static int sbp2scsi_biosparam (struct scsi_device *sdev, 
+			struct block_device *dev, sector_t capacy, int geom[]);
 #endif
 static int sbp2scsi_abort (Scsi_Cmnd *SCpnt); 
 static int sbp2scsi_reset (Scsi_Cmnd *SCpnt);

drivers/ieee1394/sbp2.c2545fix renamed from drivers/ieee1394/sbp2.c +2 -2

@@ -3139,12 +3139,12 @@
  */
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
 static int sbp2scsi_biosparam (struct scsi_device *sdev,
-		struct block_device *dev, sector_t capacy, int geom[]) 
+		struct block_device *dev, sector_t capacity, int geom[]) 
 {
 #else
 static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]) 
 {
-	sector_t capacy = disk->capacity;
+	sector_t capacity = disk->capacity;
 #endif
 	int heads, sectors, cylinders;