leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: fixup logging messages in scsi_error.c

Browse Source 
Use the matching scope for logging messages to allow for
better command tracing.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Suggested-by: Robert Elliott <elliott@hp.com>
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:27:02 +02:00 committed by Christoph Hellwig
parent c11c004b1c
commit a222b1e2fe
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/hosts.c
View File

@ -485,8 +485,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
WQ_UNBOUND | WQ_MEM_RECLAIM, WQ_UNBOUND | WQ_MEM_RECLAIM,
1, shost->host_no); 1, shost->host_no);
if (!shost->tmf_work_q) { if (!shost->tmf_work_q) {
printk(KERN_WARNING "scsi%d: failed to create tmf workq\n", shost_printk(KERN_WARNING, shost,
shost->host_no); "failed to create tmf workq\n");
goto fail_kthread; goto fail_kthread;
} }
scsi_proc_hostdir_add(shost->hostt); scsi_proc_hostdir_add(shost->hostt);

77
drivers/scsi/scsi_error.c
View File

@ -1156,9 +1156,9 @@ int scsi_eh_get_sense(struct list_head *work_q,
shost = scmd->device->host; shost = scmd->device->host;
if (scsi_host_eh_past_deadline(shost)) { if (scsi_host_eh_past_deadline(shost)) {
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, scmd_printk(KERN_INFO, scmd,
"skip %s, past eh deadline\n", "%s: skip request sense, past eh deadline\n",
__func__)); current->comm));
break; break;
} }
if (status_byte(scmd->result) != CHECK_CONDITION) if (status_byte(scmd->result) != CHECK_CONDITION)
@ -1265,9 +1265,9 @@ static int scsi_eh_test_devices(struct list_head *cmd_list,
/* Push items back onto work_q */ /* Push items back onto work_q */
list_splice_init(cmd_list, work_q); list_splice_init(cmd_list, work_q);
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, sdev->host, sdev_printk(KERN_INFO, sdev,
"skip %s, past eh deadline", "%s: skip test device, past eh deadline",
__func__)); current->comm));
break; break;
} }
} }
@ -1318,21 +1318,20 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
if (scsi_host_eh_past_deadline(shost)) { if (scsi_host_eh_past_deadline(shost)) {
list_splice_init(&check_list, work_q); list_splice_init(&check_list, work_q);
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, scmd_printk(KERN_INFO, scmd,
"skip %s, past eh deadline\n", "%s: skip aborting cmd, past eh deadline\n",
__func__)); current->comm));
return list_empty(work_q); return list_empty(work_q);
} }
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, scmd_printk(KERN_INFO, scmd,
"%s: aborting cmd: 0x%p\n", "%s: aborting cmd\n", current->comm));
current->comm, scmd));
rtn = scsi_try_to_abort_cmd(shost->hostt, scmd); rtn = scsi_try_to_abort_cmd(shost->hostt, scmd);
if (rtn == FAILED) { if (rtn == FAILED) {
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, scmd_printk(KERN_INFO, scmd,
"%s: aborting cmd failed: 0x%p\n", "%s: aborting cmd failed\n",
current->comm, scmd)); current->comm));
list_splice_init(&check_list, work_q); list_splice_init(&check_list, work_q);
return list_empty(work_q); return list_empty(work_q);
} }
@ -1390,9 +1389,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
shost_for_each_device(sdev, shost) { shost_for_each_device(sdev, shost) {
if (scsi_host_eh_past_deadline(shost)) { if (scsi_host_eh_past_deadline(shost)) {
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, sdev_printk(KERN_INFO, sdev,
"skip %s, past eh deadline\n", "%s: skip START_UNIT, past eh deadline\n",
__func__)); current->comm));
break; break;
} }
stu_scmd = NULL; stu_scmd = NULL;
@ -1407,9 +1406,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
continue; continue;
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, sdev_printk(KERN_INFO, sdev,
"%s: Sending START_UNIT to sdev: 0x%p\n", "%s: Sending START_UNIT\n",
current->comm, sdev)); current->comm));
if (!scsi_eh_try_stu(stu_scmd)) { if (!scsi_eh_try_stu(stu_scmd)) {
if (!scsi_device_online(sdev) || if (!scsi_device_online(sdev) ||
@ -1423,9 +1422,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
} }
} else { } else {
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, sdev_printk(KERN_INFO, sdev,
"%s: START_UNIT failed to sdev:" "%s: START_UNIT failed\n",
" 0x%p\n", current->comm, sdev)); current->comm));
} }
} }
@ -1456,9 +1455,9 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
shost_for_each_device(sdev, shost) { shost_for_each_device(sdev, shost) {
if (scsi_host_eh_past_deadline(shost)) { if (scsi_host_eh_past_deadline(shost)) {
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, sdev_printk(KERN_INFO, sdev,
"skip %s, past eh deadline\n", "%s: skip BDR, past eh deadline\n",
__func__)); current->comm));
break; break;
} }
bdr_scmd = NULL; bdr_scmd = NULL;
@ -1472,9 +1471,8 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
continue; continue;
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, sdev_printk(KERN_INFO, sdev,
"%s: Sending BDR sdev: 0x%p\n", "%s: Sending BDR\n", current->comm));
current->comm, sdev));
rtn = scsi_try_bus_device_reset(bdr_scmd); rtn = scsi_try_bus_device_reset(bdr_scmd);
if (rtn == SUCCESS || rtn == FAST_IO_FAIL) { if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
if (!scsi_device_online(sdev) || if (!scsi_device_online(sdev) ||
@ -1490,9 +1488,8 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
} }
} else { } else {
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, sdev_printk(KERN_INFO, sdev,
"%s: BDR failed sdev: 0x%p\n", "%s: BDR failed\n", current->comm));
current->comm, sdev));
} }
} }
@ -1528,8 +1525,8 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
list_splice_init(&tmp_list, work_q); list_splice_init(&tmp_list, work_q);
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, shost_printk(KERN_INFO, shost,
"skip %s, past eh deadline\n", "%s: Skip target reset, past eh deadline\n",
__func__)); current->comm));
return list_empty(work_q); return list_empty(work_q);
} }
@ -1591,8 +1588,8 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
list_splice_init(&check_list, work_q); list_splice_init(&check_list, work_q);
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost, shost_printk(KERN_INFO, shost,
"skip %s, past eh deadline\n", "%s: skip BRST, past eh deadline\n",
__func__)); current->comm));
return list_empty(work_q); return list_empty(work_q);
} }
@ -2193,9 +2190,9 @@ int scsi_error_handler(void *data)
*/ */
if (!shost->eh_noresume && scsi_autopm_get_host(shost) != 0) { if (!shost->eh_noresume && scsi_autopm_get_host(shost) != 0) {
SCSI_LOG_ERROR_RECOVERY(1, SCSI_LOG_ERROR_RECOVERY(1,
printk(KERN_ERR "Error handler scsi_eh_%d " shost_printk(KERN_ERR, shost,
"unable to autoresume\n", "scsi_eh_%d: unable to autoresume\n",
shost->host_no)); shost->host_no));
continue; continue;
} }