p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: Remove scsi_print_command when calling abort 

Calling scsi_print_command should not be necessary during abort;
if the information is required one should enable scsi logging.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Hannes Reinecke 2014-10-24 14:26:58 +02:00 committed by Christoph Hellwig
parent a9a47bf58a
commit 1fa6b5fbba
7 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/53c700.c
View File

@ -1906,9 +1906,7 @@ NCR_700_abort(struct scsi_cmnd * SCp)
{ {
struct NCR_700_command_slot *slot; struct NCR_700_command_slot *slot;
scmd_printk(KERN_INFO, SCp, scmd_printk(KERN_INFO, SCp, "abort command\n");
"New error handler wants to abort command\n\t");
scsi_print_command(SCp);
slot = (struct NCR_700_command_slot *)SCp->host_scribble; slot = (struct NCR_700_command_slot *)SCp->host_scribble;

5
drivers/scsi/NCR5380.c
View File

@ -2666,9 +2666,8 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
struct Scsi_Host *instance = cmd->device->host; struct Scsi_Host *instance = cmd->device->host;
struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
Scsi_Cmnd *tmp, **prev; Scsi_Cmnd *tmp, **prev;
printk(KERN_WARNING "scsi%d : aborting command\n", instance->host_no); scmd_printk(KERN_WARNING, cmd, "aborting command\n");
scsi_print_command(cmd);
NCR5380_print_status(instance); NCR5380_print_status(instance);

10
drivers/scsi/arm/fas216.c
View File

@ -2423,14 +2423,11 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
info->stats.aborts += 1; info->stats.aborts += 1;
printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no); scmd_printk(KERN_WARNING, SCpnt, "abort command\n");
__scsi_print_command(SCpnt->cmnd, SCpnt->cmd_len);
print_debug_list(); print_debug_list();
fas216_dumpstate(info); fas216_dumpstate(info);
printk(KERN_WARNING "scsi%d: abort %p ", info->host->host_no, SCpnt);
switch (fas216_find_command(info, SCpnt)) { switch (fas216_find_command(info, SCpnt)) {
/* /*
* We found the command, and cleared it out. Either * We found the command, and cleared it out. Either
@ -2438,7 +2435,7 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
* target, or the busylun bit is not set. * target, or the busylun bit is not set.
*/ */
case res_success: case res_success:
printk("success\n"); scmd_printk(KERN_WARNING, SCpnt, "abort %p success\n", SCpnt);
result = SUCCESS; result = SUCCESS;
break; break;
@ -2448,14 +2445,13 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
* if the bus is free. * if the bus is free.
*/ */
case res_hw_abort: case res_hw_abort:
/* /*
* We are unable to abort the command for some reason. * We are unable to abort the command for some reason.
*/ */
default: default:
case res_failed: case res_failed:
printk("failed\n"); scmd_printk(KERN_WARNING, SCpnt, "abort %p failed\n", SCpnt);
break; break;
} }

3
drivers/scsi/atari_NCR5380.c
View File

@ -2623,8 +2623,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd)
Scsi_Cmnd *tmp, **prev; Scsi_Cmnd *tmp, **prev;
unsigned long flags; unsigned long flags;
printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO); scmd_printk(KERN_NOTICE, cmd, "aborting command\n");
scsi_print_command(cmd);
NCR5380_print_status(instance); NCR5380_print_status(instance);

4
drivers/scsi/ps3rom.c
View File

@ -220,10 +220,6 @@ static int ps3rom_queuecommand_lck(struct scsi_cmnd *cmd,
unsigned char opcode; unsigned char opcode;
int res; int res;
#ifdef DEBUG
scsi_print_command(cmd);
#endif
priv->curr_cmd = cmd; priv->curr_cmd = cmd;
cmd->scsi_done = done; cmd->scsi_done = done;

9
drivers/scsi/stex.c
View File

@ -1162,9 +1162,7 @@ static int stex_abort(struct scsi_cmnd *cmd)
int result = SUCCESS; int result = SUCCESS;
unsigned long flags; unsigned long flags;
printk(KERN_INFO DRV_NAME scmd_printk(KERN_INFO, cmd, "aborting command\n");
"(%s): aborting command\n", pci_name(hba->pdev));
scsi_print_command(cmd);
base = hba->mmio_base; base = hba->mmio_base;
spin_lock_irqsave(host->host_lock, flags); spin_lock_irqsave(host->host_lock, flags);
@ -1352,9 +1350,8 @@ static int stex_reset(struct scsi_cmnd *cmd)
hba = (struct st_hba *) &cmd->device->host->hostdata[0]; hba = (struct st_hba *) &cmd->device->host->hostdata[0];
printk(KERN_INFO DRV_NAME shost_printk(KERN_INFO, cmd->device->host,
"(%s): resetting host\n", pci_name(hba->pdev)); "resetting host\n");
scsi_print_command(cmd);
return stex_do_reset(hba) ? FAILED : SUCCESS; return stex_do_reset(hba) ? FAILED : SUCCESS;
} }

3
drivers/scsi/sun3_NCR5380.c
View File

@ -2608,8 +2608,7 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)
struct scsi_cmnd *tmp, **prev; struct scsi_cmnd *tmp, **prev;
unsigned long flags; unsigned long flags;
printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO); scmd_printk(KERN_NOTICE, cmd, "aborting command\n");
scsi_print_command(cmd);
NCR5380_print_status (instance); NCR5380_print_status (instance);