[Linux1394-cvslog] rev 778 - trunk

[SVN U. <ben...@li...>]

Author: bencollins
Date: 2003-02-10 18:06:18 -0500 (Mon, 10 Feb 2003)
New Revision: 778

Modified:
   trunk/sbp2.c
Log:
Merge from 2.5.60. Updates to scsi layer.


Modified: trunk/sbp2.c
==============================================================================
--- trunk/sbp2.c	(original)
+++ trunk/sbp2.c	2003-02-10 18:06:19.000000000 -0500
@@ -822,7 +822,7 @@
 {
 	struct sbp2scsi_host_info *hi;
 	
-	hi = (struct sbp2scsi_host_info *) command->Current_SCpnt->host->hostdata[0];
+	hi = (struct sbp2scsi_host_info *) command->Current_SCpnt->device->host->hostdata[0];
 
 	if (hi == NULL) {
 		printk(KERN_ERR "%s: hi == NULL\n", __FUNCTION__);
@@ -2661,7 +2661,7 @@
 	/*
 	 * Pull our host info and scsi id instance data from the scsi command
 	 */
-	hi = (struct sbp2scsi_host_info *) SCpnt->host->hostdata[0];
+	hi = (struct sbp2scsi_host_info *) SCpnt->device->host->hostdata[0];
 
 	if (!hi) {
 		SBP2_ERR("sbp2scsi_host_info is NULL - this is bad!");
@@ -2670,7 +2670,7 @@
 		return(0);
 	}
 
-	scsi_id = hi->scsi_id[SCpnt->target];
+	scsi_id = hi->scsi_id[SCpnt->device->id];
 
 	/*
 	 * If scsi_id is null, it means there is no device in this slot,
@@ -2686,7 +2686,7 @@
 	 * Until we handle multiple luns, just return selection time-out
 	 * to any IO directed at non-zero LUNs
 	 */
-	if (SCpnt->lun) {
+	if (SCpnt->device->lun) {
 		SCpnt->result = DID_NO_CONNECT << 16;
 		done (SCpnt);
 		return(0);
@@ -2888,8 +2888,8 @@
  */
 static int sbp2scsi_abort (Scsi_Cmnd *SCpnt) 
 {
-	struct sbp2scsi_host_info *hi = (struct sbp2scsi_host_info *) SCpnt->host->hostdata[0];
-	struct scsi_id_instance_data *scsi_id = hi->scsi_id[SCpnt->target];
+	struct sbp2scsi_host_info *hi = (struct sbp2scsi_host_info *) SCpnt->host->device->hostdata[0];
+	struct scsi_id_instance_data *scsi_id = hi->scsi_id[SCpnt->device->id];
 	struct sbp2_command_info *command;
 	unsigned long flags;
 
@@ -2938,8 +2938,8 @@
  */
 static int sbp2scsi_reset (Scsi_Cmnd *SCpnt) 
 {
-	struct sbp2scsi_host_info *hi = (struct sbp2scsi_host_info *) SCpnt->host->hostdata[0];
-	struct scsi_id_instance_data *scsi_id = hi->scsi_id[SCpnt->target];
+	struct sbp2scsi_host_info *hi = (struct sbp2scsi_host_info *) SCpnt->host->device->hostdata[0];
+	struct scsi_id_instance_data *scsi_id = hi->scsi_id[SCpnt->device->id];
 
 	SBP2_ERR("reset requested");