From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: torvalds@transmeta.com, linux-kernel@vger.kernel.org
Subject: PATCH: fix i2o_scsi (submission from Randy)
Date: Fri, 14 Feb 2003 21:03:18 +0000 (GMT) [thread overview]
Message-ID: <E18jmzO-0005fM-00@the-village.bc.nu> (raw)
Just approving this as maintainer of i2o_scsi
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.60-ref/drivers/message/i2o/i2o_scsi.c linux-2.5.60-ac1/drivers/message/i2o/i2o_scsi.c
--- linux-2.5.60-ref/drivers/message/i2o/i2o_scsi.c 2003-02-14 21:21:41.000000000 +0000
+++ linux-2.5.60-ac1/drivers/message/i2o/i2o_scsi.c 2003-02-14 19:14:46.000000000 +0000
@@ -224,7 +224,7 @@
spin_unlock_irqrestore(&retry_lock, flags);
/* Create a scsi error for this */
current_command = (Scsi_Cmnd *)m[3];
- lock = current_command->host->host_lock;
+ lock = current_command->device->host->host_lock;
printk("Aborted %ld\n", current_command->serial_number);
spin_lock_irqsave(lock, flags);
@@ -328,7 +328,7 @@
else if (current_command->request_bufflen)
pci_unmap_single(c->pdev, (dma_addr_t)((long)current_command->SCp.ptr), current_command->request_bufflen, scsi_to_pci_dma_dir(current_command->sc_data_direction));
- lock = current_command->host->host_lock;
+ lock = current_command->device->host->host_lock;
spin_lock_irqsave(lock, flags);
current_command->scsi_done(current_command);
spin_unlock_irqrestore(lock, flags);
@@ -606,7 +606,7 @@
* Do the incoming paperwork
*/
- host = SCpnt->host;
+ host = SCpnt->device->host;
hostdata = (struct i2o_scsi_host *)host->hostdata;
c = hostdata->controller;
@@ -615,13 +615,13 @@
SCpnt->scsi_done = done;
- if(SCpnt->target > 15)
+ if(SCpnt->device->id > 15)
{
- printk(KERN_ERR "i2o_scsi: Wild target %d.\n", SCpnt->target);
+ printk(KERN_ERR "i2o_scsi: Wild target %d.\n", SCpnt->device->id);
return -1;
}
- tid = hostdata->task[SCpnt->target][SCpnt->lun];
+ tid = hostdata->task[SCpnt->device->id][SCpnt->device->lun];
dprintk(("qcmd: Tid = %d\n", tid));
@@ -712,10 +712,10 @@
* with tagged queueing. We throw in the odd ordered
* tag to stop them starving themselves.
*/
- if((jiffies - hostdata->tagclock[SCpnt->target][SCpnt->lun]) > (5*HZ))
+ if((jiffies - hostdata->tagclock[SCpnt->device->id][SCpnt->device->lun]) > (5*HZ))
{
tag=0x01800000; /* ORDERED! */
- hostdata->tagclock[SCpnt->target][SCpnt->lun]=jiffies;
+ hostdata->tagclock[SCpnt->device->id][SCpnt->device->lun]=jiffies;
}
else
{
@@ -916,9 +916,9 @@
printk(KERN_WARNING "i2o_scsi: Aborting command block.\n");
- host = SCpnt->host;
+ host = SCpnt->device->host;
hostdata = (struct i2o_scsi_host *)host->hostdata;
- tid = hostdata->task[SCpnt->target][SCpnt->lun];
+ tid = hostdata->task[SCpnt->device->id][SCpnt->device->lun];
if(tid==-1)
{
printk(KERN_ERR "i2o_scsi: Impossible command to abort!\n");
@@ -982,7 +982,7 @@
*/
- host = SCpnt->host;
+ host = SCpnt->device->host;
spin_unlock_irq(host->host_lock);
reply other threads:[~2003-02-14 21:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E18jmzO-0005fM-00@the-village.bc.nu \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).