提交 f5ad5614 编写于 作者: C Christoph Hellwig 提交者: James Bottomley

[SCSI] remove scsi_cmnd->abort_reason

Never used for anything but printing it out in debug routines.
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
上级 a4c8f628
...@@ -9192,8 +9192,8 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s) ...@@ -9192,8 +9192,8 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s)
s->sc_data_direction, s->resid); s->sc_data_direction, s->resid);
printk( printk(
" use_sg %u, sglist_len %u, abort_reason 0x%x\n", " use_sg %u, sglist_len %u\n",
s->use_sg, s->sglist_len, s->abort_reason); s->use_sg, s->sglist_len);
printk( printk(
" serial_number 0x%x, retries %d, allowed %d\n", " serial_number 0x%x, retries %d, allowed %d\n",
......
...@@ -449,7 +449,7 @@ static int eata_pio_abort(struct scsi_cmnd *cmd) ...@@ -449,7 +449,7 @@ static int eata_pio_abort(struct scsi_cmnd *cmd)
{ {
uint loop = HZ; uint loop = HZ;
DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_abort called pid: %ld " "target: %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason)); DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_abort called pid: %ld " "target: %x lun: %x\n", cmd->pid, cmd->device->id, cmd->device->lun));
while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY) while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY)
...@@ -484,7 +484,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) ...@@ -484,7 +484,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
struct scsi_cmnd *sp; struct scsi_cmnd *sp;
struct Scsi_Host *host = cmd->device->host; struct Scsi_Host *host = cmd->device->host;
DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason)); DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x\n", cmd->pid, cmd->device->id, cmd->device->lun));
spin_lock_irq(host->host_lock); spin_lock_irq(host->host_lock);
......
...@@ -719,7 +719,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq) ...@@ -719,7 +719,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)
/* /*
* Start the timer ticking. * Start the timer ticking.
*/ */
cmd->abort_reason = 0;
cmd->result = 0; cmd->result = 0;
SCSI_LOG_MLQUEUE(3, printk("Leaving scsi_init_cmd_from_req()\n")); SCSI_LOG_MLQUEUE(3, printk("Leaving scsi_init_cmd_from_req()\n"));
......
...@@ -1829,7 +1829,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag) ...@@ -1829,7 +1829,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
scmd->bufflen = 0; scmd->bufflen = 0;
scmd->request_buffer = NULL; scmd->request_buffer = NULL;
scmd->request_bufflen = 0; scmd->request_bufflen = 0;
scmd->abort_reason = DID_ABORT;
scmd->cmd_len = 0; scmd->cmd_len = 0;
......
...@@ -301,7 +301,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd) ...@@ -301,7 +301,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
{ {
cmd->owner = SCSI_OWNER_MIDLEVEL; cmd->owner = SCSI_OWNER_MIDLEVEL;
cmd->serial_number = 0; cmd->serial_number = 0;
cmd->abort_reason = 0;
memset(cmd->sense_buffer, 0, sizeof cmd->sense_buffer); memset(cmd->sense_buffer, 0, sizeof cmd->sense_buffer);
...@@ -322,7 +321,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd) ...@@ -322,7 +321,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd)); memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd));
cmd->buffer = cmd->request_buffer; cmd->buffer = cmd->request_buffer;
cmd->bufflen = cmd->request_bufflen; cmd->bufflen = cmd->request_bufflen;
cmd->abort_reason = 0;
return 1; return 1;
} }
......
...@@ -79,8 +79,6 @@ struct scsi_cmnd { ...@@ -79,8 +79,6 @@ struct scsi_cmnd {
* sense info */ * sense info */
unsigned short use_sg; /* Number of pieces of scatter-gather */ unsigned short use_sg; /* Number of pieces of scatter-gather */
unsigned short sglist_len; /* size of malloc'd scatter-gather list */ unsigned short sglist_len; /* size of malloc'd scatter-gather list */
unsigned short abort_reason; /* If the mid-level code requests an
* abort, this is the reason. */
unsigned bufflen; /* Size of data buffer */ unsigned bufflen; /* Size of data buffer */
void *buffer; /* Data buffer */ void *buffer; /* Data buffer */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册