ACK for the trivial portion surrounding aacraid and ips! Sincerely -- Mark Salyzyn > -----Original Message----- > From: linux-scsi-owner@xxxxxxxxxxxxxxx > [mailto:linux-scsi-owner@xxxxxxxxxxxxxxx] On Behalf Of > malahal@xxxxxxxxxx > Sent: Thursday, October 04, 2007 2:18 PM > To: linux-scsi@xxxxxxxxxxxxxxx; jens.axboe@xxxxxxxxxx > Subject: [RFC] [PATCH 1/2] blk request timeout handler patches > > Mike Christie's patches refreshed to 2.6.23-rc8-mm1. > > Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx> > Signed-off-by: Malahal Naineni <malahal@xxxxxxxxxx> . . . > diff -r 3697367c6e4d drivers/scsi/aacraid/aachba.c > --- a/drivers/scsi/aacraid/aachba.c Thu Sep 27 00:12:13 2007 -0700 > +++ b/drivers/scsi/aacraid/aachba.c Thu Sep 27 00:13:07 2007 -0700 > @@ -1125,7 +1125,7 @@ static struct aac_srb * aac_scsi_common( > srbcmd->id = cpu_to_le32(scmd_id(cmd)); > srbcmd->lun = cpu_to_le32(cmd->device->lun); > srbcmd->flags = cpu_to_le32(flag); > - timeout = cmd->timeout_per_command/HZ; > + timeout = cmd->request->timeout/HZ; > if (timeout == 0) > timeout = 1; > srbcmd->timeout = cpu_to_le32(timeout); // timeout in seconds . . . > diff -r 3697367c6e4d drivers/scsi/ips.c > --- a/drivers/scsi/ips.c Thu Sep 27 00:12:13 2007 -0700 > +++ b/drivers/scsi/ips.c Thu Sep 27 00:13:07 2007 -0700 > @@ -3862,7 +3862,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * > scb->cmd.dcdb.segment_4G = 0; > scb->cmd.dcdb.enhanced_sg = 0; > > - TimeOut = scb->scsi_cmd->timeout_per_command; > + TimeOut = scb->scsi_cmd->request->timeout; > > if (ha->subsys->param[4] & 0x00100000) { > /* If NEW Tape DCDB is Supported */ > if (!scb->sg_len) { . . . - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
