2002-11-01 00:55:21

by Miles Lane

[permalink] [raw]

Subject: [PATCH] Re: ieee1394/sbp2.c doesn't compile in 2.5.45

---

Douglas wrote:

> 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

> --- linux/drivers/ieee1394/sbp2.h 2002-10-26 03:11:32.000000000 +1000
> +++ linux/drivers/ieee1394/sbp2.h2544bk3fix 2002-10-31 11:27:25.000000000 +1100
> @@ -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
> @@ -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;

2002-11-01 02:03:26

by Douglas Gilbert

[permalink] [raw]

Subject: Re: [PATCH] Re: ieee1394/sbp2.c doesn't compile in 2.5.45

---

--- linux/drivers/ieee1394/sbp2.h 2002-10-26 03:11:32.000000000 +1000
+++ linux/drivers/ieee1394/sbp2.h2545fix 2002-10-31 11:27:25.000000000 +1100
@@ -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-11-01 09:20:53.000000000 +1100
+++ linux/drivers/ieee1394/sbp2.c2545fix 2002-11-01 09:53:40.000000000 +1100
@@ -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;

---

Attachments:

sbp2_2545.diff (1.19 kB)