[PATCH 2.5.60 aic79xx] aic79xx build and lun detect problem fix

[PATCH 2.5.60 aic79xx] aic79xx build and lun detect problem fix

[ISHIKAWA Mutsumi]

 This patch will fix two problems.

  fix build problem related scsi_cmnd changes

  http://linux.bkbits.net:8080/linux-2.5/diffs/drivers/scsi/aic7xxx/aic79xx_osm.c@1.16?nav=index.html|src/|src/drivers|src/drivers/scsi|src/drivers/scsi/aic7xxx|hist/drivers/scsi/aic7xxx/aic79xx_osm.c

    This change(latest aic79xx driver and scsi_cmnd changes merging)
    is dropped `hscb->lun = cmd->device->lun;' (in aic79xx_osm.c line
    4272). This change cause lun detect problem. I believe it is still
    needed.


--- linux-2.5/drivers/scsi/aic7xxx/aic79xx_osm.c.orig	2003-02-11 14:58:01.000000000 +0900
+++ linux-2.5/drivers/scsi/aic7xxx/aic79xx_osm.c	2003-02-11 16:08:00.000000000 +0900
@@ -1560,7 +1560,7 @@
 	hscb = scb->hscb;
 	hscb->control = 0;
 	hscb->scsiid = BUILD_SCSIID(ahd, cmd);
-	hscb->lun = cmd->lun;
+	hscb->lun = cmd->device->lun;
 	hscb->cdb_len = 0;
 	hscb->task_management = SIU_TASKMGMT_LUN_RESET;
 	scb->flags |= SCB_DEVICE_RESET|SCB_RECOVERY_SCB|SCB_ACTIVE;
@@ -4269,6 +4269,7 @@
 		 */
 		hscb->control = 0;
 		hscb->scsiid = BUILD_SCSIID(ahd, cmd);
+		hscb->lun = cmd->device->lun;
 		scb->hscb->task_management = 0;
 		mask = SCB_GET_TARGET_MASK(ahd, scb);
 

-- 
ISHIKAWA Mutsumi
 <ishikawa@linux.or.jp>, <ishikawa@debian.org>, <ishikawa@netvillage.co.jp>

Re: [PATCH 2.5.60 aic79xx] aic79xx build and lun detect problem fix

[Justin T. Gibbs]

>  This patch will fix two problems.
> 
>   fix build problem related scsi_cmnd changes

The aic7xxx driver has one place that missed the conversion too.
Since the cmd->lun field is no longer filled in, why hasn't the
field been removed from the cmd structure?  That would make it
easy to catch these kinds of bugs.

Thanks for the report.  We're close to doing another aic79xx
driver drop and I'll incorporate the change then.

--
Justin
> 
>   http://linux.bkbits.net:8080/linux-2.5/diffs/drivers/scsi/aic7xxx/aic79xx_osm.c@1.16?nav=index.html|src/|src/drivers|src/drivers/scsi|src/drivers/scsi/aic7xxx|hist/drivers/scsi/aic7xxx/aic79xx_osm.c
> 
>     This change(latest aic79xx driver and scsi_cmnd changes merging)
>     is dropped `hscb->lun = cmd->device->lun;' (in aic79xx_osm.c line
>     4272). This change cause lun detect problem. I believe it is still
>     needed.
> 
> 
> --- linux-2.5/drivers/scsi/aic7xxx/aic79xx_osm.c.orig	2003-02-11 14:58:01.000000000 +0900
> +++ linux-2.5/drivers/scsi/aic7xxx/aic79xx_osm.c	2003-02-11 16:08:00.000000000 +0900
> @@ -1560,7 +1560,7 @@
>  	hscb = scb->hscb;
>  	hscb->control = 0;
>  	hscb->scsiid = BUILD_SCSIID(ahd, cmd);
> -	hscb->lun = cmd->lun;
> +	hscb->lun = cmd->device->lun;
>  	hscb->cdb_len = 0;
>  	hscb->task_management = SIU_TASKMGMT_LUN_RESET;
>  	scb->flags |= SCB_DEVICE_RESET|SCB_RECOVERY_SCB|SCB_ACTIVE;
> @@ -4269,6 +4269,7 @@
>  		 */
>  		hscb->control = 0;
>  		hscb->scsiid = BUILD_SCSIID(ahd, cmd);
> +		hscb->lun = cmd->device->lun;
>  		scb->hscb->task_management = 0;
>  		mask = SCB_GET_TARGET_MASK(ahd, scb);
>  
> 
> -- 
> ISHIKAWA Mutsumi
>  <ishikawa@linux.or.jp>, <ishikawa@debian.org>, <ishikawa@netvillage.co.jp>

Re: [PATCH 2.5.60 aic79xx] aic79xx build and lun detect problem fix

[Christoph Hellwig]

On Tue, Feb 11, 2003 at 01:06:41PM -0700, Justin T. Gibbs wrote:
> >  This patch will fix two problems.
> > 
> >   fix build problem related scsi_cmnd changes
> 
> The aic7xxx driver has one place that missed the conversion too.
> Since the cmd->lun field is no longer filled in, why hasn't the
> field been removed from the cmd structure?  That would make it
> easy to catch these kinds of bugs.

I don't think that was intentional.  I'll submit a patch to remove it ASAP.

Re: [PATCH 2.5.60 aic79xx] aic79xx build and lun detect problem fix

[Christoph Hellwig]

On Tue, Feb 11, 2003 at 08:21:12PM +0000, Christoph Hellwig wrote:
> On Tue, Feb 11, 2003 at 01:06:41PM -0700, Justin T. Gibbs wrote:
> > >  This patch will fix two problems.
> > > 
> > >   fix build problem related scsi_cmnd changes
> > 
> > The aic7xxx driver has one place that missed the conversion too.
> > Since the cmd->lun field is no longer filled in, why hasn't the
> > field been removed from the cmd structure?  That would make it
> > easy to catch these kinds of bugs.
> 
> I don't think that was intentional.  I'll submit a patch to remove it ASAP.

Actually it is already gone.

Re: [PATCH 2.5.60 aic79xx] aic79xx build and lun detect problem fix

[James Bottomley]

On Tue, 2003-02-11 at 12:25, ISHIKAWA Mutsumi wrote:
> 
>  This patch will fix two problems.

The first one I already have from Doug Gilbert.  I'll add the second.

James