[PATCH 20/26] sd: Cleanup logging
Open-code scsi_print_result in sd.c, and cleanup logging to
not print duplicate informations.
With that we can remove scsi_show_result in constants.c
Reviewed-by: Robert Elliott elli...@hp.com
Reviewed-by: Christoph Hellwig h...@lst.de
Signed-off-by: Hannes Reinecke h...@suse.de
---
drivers/scsi/constants.c | 16
drivers/scsi/sd.c| 50 +---
include/scsi/scsi_dbg.h | 1 -
3 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 0fe50b4..5e64afc 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1439,22 +1439,6 @@ const char *scsi_driverbyte_string(int result)
}
EXPORT_SYMBOL(scsi_driverbyte_string);
-void scsi_show_result(int result)
-{
- const char *hb_string = scsi_hostbyte_string(result);
- const char *db_string = scsi_driverbyte_string(result);
-
- if (hb_string || db_string)
- printk(Result: hostbyte=%s driverbyte=%s\n,
- hb_string ? hb_string : invalid,
- db_string ? db_string : invalid);
- else
- printk(Result: hostbyte=0x%02x driverbyte=0x%02x\n,
- host_byte(result), driver_byte(result));
-}
-EXPORT_SYMBOL(scsi_show_result);
-
-
void scsi_print_result(struct scsi_cmnd *cmd)
{
const char *hb_string = scsi_hostbyte_string(cmd-result);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 848b17d..ed40b85 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -116,7 +116,7 @@ static int sd_eh_action(struct scsi_cmnd *, int);
static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
static void scsi_disk_release(struct device *cdev);
static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
-static void sd_print_result(struct scsi_disk *, int);
+static void sd_print_result(const struct scsi_disk *, const char *, int);
static DEFINE_SPINLOCK(sd_index_lock);
static DEFINE_IDA(sd_index_ida);
@@ -1479,7 +1479,7 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
}
if (res) {
- sd_print_result(sdkp, res);
+ sd_print_result(sdkp, Synchronize Cache(10) failed, res);
if (driver_byte(res) DRIVER_SENSE)
sd_print_sense_hdr(sdkp, sshdr);
@@ -1700,17 +1700,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
if (sense_valid)
sense_deferred = scsi_sense_is_deferred(sshdr);
}
-#ifdef CONFIG_SCSI_LOGGING
- SCSI_LOG_HLCOMPLETE(1, scsi_print_result(SCpnt));
- if (sense_valid) {
- SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
- sd_done: sb[respc,sk,asc,
- ascq]=%x,%x,%x,%x\n,
- sshdr.response_code,
- sshdr.sense_key, sshdr.asc,
- sshdr.ascq));
- }
-#endif
sdkp-medium_access_timed_out = 0;
if (driver_byte(result) != DRIVER_SENSE
@@ -1765,6 +1754,10 @@ static int sd_done(struct scsi_cmnd *SCpnt)
break;
}
out:
+ SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
+ sd_done: completed %d of %d
bytes\n,
+ good_bytes, scsi_bufflen(SCpnt)));
+
if (rq_data_dir(SCpnt-request) == READ scsi_prot_sg_count(SCpnt))
sd_dif_complete(SCpnt, good_bytes);
@@ -1820,12 +1813,12 @@ sd_spinup_disk(struct scsi_disk *sdkp)
/* no sense, TUR either succeeded or failed
* with a status error */
if(!spintime !scsi_status_is_good(the_result)) {
- sd_printk(KERN_NOTICE, sdkp, Unit Not
Ready\n);
- sd_print_result(sdkp, the_result);
+ sd_print_result(sdkp, Test Unit Ready failed,
+ the_result);
}
break;
}
-
+
/*
* The device does not want the automatic start to be issued.
*/
@@ -1941,7 +1934,6 @@ static void read_capacity_error(struct scsi_disk *sdkp,
struct scsi_device *sdp,
struct scsi_sense_hdr *sshdr, int sense_valid,
int the_result)
{
- sd_print_result(sdkp, the_result);
if (driver_byte(the_result) DRIVER_SENSE)
sd_print_sense_hdr(sdkp, sshdr);
else
@@ -2022,7 +2014,7 @@ static int read_capacity_16(struct scsi_disk *sdkp,
struct scsi_device *sdp,
} while (the_result retries);
if
[PATCH 20/26] sd: Cleanup logging
Open-code scsi_print_result in sd.c, and cleanup logging to
not print duplicate informations.
With that we can remove scsi_show_result in constants.c
Reviewed-by: Robert Elliott elli...@hp.com
Reviewed-by: Christoph Hellwig h...@lst.de
Signed-off-by: Hannes Reinecke h...@suse.de
---
drivers/scsi/constants.c | 16
drivers/scsi/sd.c| 46 --
include/scsi/scsi_dbg.h | 1 -
3 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 3244ec2..1ebdc5d 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1439,22 +1439,6 @@ const char *scsi_driverbyte_string(int result)
}
EXPORT_SYMBOL(scsi_driverbyte_string);
-void scsi_show_result(int result)
-{
- const char *hb_string = scsi_hostbyte_string(result);
- const char *db_string = scsi_driverbyte_string(result);
-
- if (hb_string || db_string)
- printk(Result: hostbyte=%s driverbyte=%s\n,
- hb_string ? hb_string : invalid,
- db_string ? db_string : invalid);
- else
- printk(Result: hostbyte=0x%02x driverbyte=0x%02x\n,
- host_byte(result), driver_byte(result));
-}
-EXPORT_SYMBOL(scsi_show_result);
-
-
void scsi_print_result(struct scsi_cmnd *cmd)
{
const char *hb_string = scsi_hostbyte_string(cmd-result);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 848b17d..20b0539 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -116,7 +116,7 @@ static int sd_eh_action(struct scsi_cmnd *, int);
static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
static void scsi_disk_release(struct device *cdev);
static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
-static void sd_print_result(struct scsi_disk *, int);
+static void sd_print_result(struct scsi_disk *, const char *, int);
static DEFINE_SPINLOCK(sd_index_lock);
static DEFINE_IDA(sd_index_ida);
@@ -1479,7 +1479,7 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
}
if (res) {
- sd_print_result(sdkp, res);
+ sd_print_result(sdkp, SYNCHRONIZE_CACHE failed, res);
if (driver_byte(res) DRIVER_SENSE)
sd_print_sense_hdr(sdkp, sshdr);
@@ -1700,17 +1700,9 @@ static int sd_done(struct scsi_cmnd *SCpnt)
if (sense_valid)
sense_deferred = scsi_sense_is_deferred(sshdr);
}
-#ifdef CONFIG_SCSI_LOGGING
- SCSI_LOG_HLCOMPLETE(1, scsi_print_result(SCpnt));
- if (sense_valid) {
- SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
- sd_done: sb[respc,sk,asc,
- ascq]=%x,%x,%x,%x\n,
- sshdr.response_code,
- sshdr.sense_key, sshdr.asc,
- sshdr.ascq));
- }
-#endif
+ SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
+ sd_done: completed %d bytes\n,
+ good_bytes));
sdkp-medium_access_timed_out = 0;
if (driver_byte(result) != DRIVER_SENSE
@@ -1820,12 +1812,12 @@ sd_spinup_disk(struct scsi_disk *sdkp)
/* no sense, TUR either succeeded or failed
* with a status error */
if(!spintime !scsi_status_is_good(the_result)) {
- sd_printk(KERN_NOTICE, sdkp, Unit Not
Ready\n);
- sd_print_result(sdkp, the_result);
+ sd_print_result(sdkp, Unit Not Ready,
+ the_result);
}
break;
}
-
+
/*
* The device does not want the automatic start to be issued.
*/
@@ -1941,7 +1933,7 @@ static void read_capacity_error(struct scsi_disk *sdkp,
struct scsi_device *sdp,
struct scsi_sense_hdr *sshdr, int sense_valid,
int the_result)
{
- sd_print_result(sdkp, the_result);
+ sd_print_result(sdkp, READ CAPACITY failed, the_result);
if (driver_byte(the_result) DRIVER_SENSE)
sd_print_sense_hdr(sdkp, sshdr);
else
@@ -3126,8 +3118,7 @@ static int sd_start_stop_device(struct scsi_disk *sdkp,
int start)
res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, sshdr,
SD_TIMEOUT, SD_MAX_RETRIES, NULL, REQ_PM);
if (res) {
- sd_printk(KERN_WARNING, sdkp, START_STOP FAILED\n);
- sd_print_result(sdkp, res);
+
