From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@infradead.org>,
linux-scsi@vger.kernel.org, Robert Elliott <elliott@hp.com>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 20/27] sd: Cleanup logging
Date: Mon, 20 Oct 2014 08:52:23 +0200 [thread overview]
Message-ID: <1413787950-14659-21-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1413787950-14659-1-git-send-email-hare@suse.de>
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 <elliott@hp.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@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 (the_result) {
- sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY(16) failed\n");
+ sd_print_result(sdkp, "Read Capacity(16) failed", the_result);
read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
return -EINVAL;
}
@@ -2104,7 +2096,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
} while (the_result && retries);
if (the_result) {
- sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY failed\n");
+ sd_print_result(sdkp, "Read Capacity(10) failed", the_result);
read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
return -EINVAL;
}
@@ -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);
+ sd_print_result(sdkp, "Start/Stop Unit failed", res);
if (driver_byte(res) & DRIVER_SENSE)
sd_print_sense_hdr(sdkp, &sshdr);
if (scsi_sense_valid(&sshdr) &&
@@ -3328,9 +3319,20 @@ static void sd_print_sense_hdr(struct scsi_disk *sdkp,
sshdr->asc, sshdr->ascq);
}
-static void sd_print_result(struct scsi_disk *sdkp, int result)
+static void sd_print_result(const struct scsi_disk *sdkp, const char *msg,
+ int result)
{
- sd_printk(KERN_INFO, sdkp, " ");
- scsi_show_result(result);
+ const char *hb_string = scsi_hostbyte_string(result);
+ const char *db_string = scsi_driverbyte_string(result);
+
+ if (hb_string || db_string)
+ sd_printk(KERN_INFO, sdkp,
+ "%s: Result: hostbyte=%s driverbyte=%s\n", msg,
+ hb_string ? hb_string : "invalid",
+ db_string ? db_string : "invalid");
+ else
+ sd_printk(KERN_INFO, sdkp,
+ "%s: Result: hostbyte=0x%02x driverbyte=0x%02x\n",
+ msg, host_byte(result), driver_byte(result));
}
diff --git a/include/scsi/scsi_dbg.h b/include/scsi/scsi_dbg.h
index 50f4d85..f41a86b 100644
--- a/include/scsi/scsi_dbg.h
+++ b/include/scsi/scsi_dbg.h
@@ -17,7 +17,6 @@ extern void scsi_print_sense(const struct scsi_cmnd *);
extern void __scsi_print_sense(const struct scsi_device *, const char *name,
const unsigned char *sense_buffer,
int sense_len);
-extern void scsi_show_result(int);
extern void scsi_print_result(struct scsi_cmnd *);
extern const char *scsi_hostbyte_string(int);
extern const char *scsi_driverbyte_string(int);
--
1.8.5.2
next prev parent reply other threads:[~2014-10-20 6:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 6:52 [PATCHv7 00/27] scsi logging update (the boring part) Hannes Reinecke
2014-10-20 6:52 ` [PATCH 01/27] Remove scsi_cmd_print_sense_hdr() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 02/27] sd: Remove scsi_print_sense() in sd_done() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 03/27] aha152x: Debug output update and whitespace cleanup Hannes Reinecke
2014-10-20 6:52 ` [PATCH 04/27] scsi: introduce sdev_prefix_printk() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 05/27] scsi: Use sdev as argument for sense code printing Hannes Reinecke
2014-10-20 6:52 ` [PATCH 06/27] acornscsi: use scsi_print_command() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 07/27] fas216: Return DID_ERROR for incomplete data transfer Hannes Reinecke
2014-10-20 6:52 ` [PATCH 08/27] fas216: Update logging messages Hannes Reinecke
2014-10-20 6:52 ` [PATCH 09/27] 53c700: remove scsi_print_sense() usage Hannes Reinecke
2014-10-20 6:52 ` [PATCH 10/27] scsi: stop decoding if scsi_normalize_sense() fails Hannes Reinecke
2014-10-20 6:52 ` [PATCH 11/27] scsi: do not decode sense extras Hannes Reinecke
2014-10-20 6:52 ` [PATCH 12/27] scsi: use 'bool' as return value for scsi_normalize_sense() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 13/27] scsi: remove scsi_print_status() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 14/27] Implement scsi_opcode_sa_name Hannes Reinecke
2014-10-20 6:52 ` [PATCH 15/27] scsi: merge print_opcode_name() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 16/27] scsi: consolidate opcode lookup in scsi_opcode_sa_name() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 17/27] scsi: repurpose the last argument from print_opcode_name() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 18/27] scsi: Remove scsi_print_command when calling abort Hannes Reinecke
2014-10-20 6:52 ` [PATCH 19/27] scsi: separate out scsi_(host|driver)byte_string() Hannes Reinecke
2014-10-20 6:52 ` Hannes Reinecke [this message]
2014-10-20 6:52 ` [PATCH 21/27] scsi: simplify scsi_log_(send|completion) Hannes Reinecke
2014-10-20 6:52 ` [PATCH 22/27] scsi: fixup logging messages in scsi_error.c Hannes Reinecke
2014-10-20 6:52 ` [PATCH 23/27] scsi: use shost argument in scsi_eh_prt_fail_stats Hannes Reinecke
2014-10-20 6:52 ` [PATCH 24/27] scsi_error: document scsi_try_to_abort_cmd Hannes Reinecke
2014-10-20 6:52 ` [PATCH 25/27] scsi: check for correct return code in scsi_eh_abort_cmds() Hannes Reinecke
2014-10-20 6:52 ` [PATCH 26/27] scsi: correct return values for .eh_abort_handler implementations Hannes Reinecke
2014-10-20 6:52 ` [PATCH 27/27] scsi: ratelimit I/O error messages Hannes Reinecke
2014-10-21 16:10 ` Elliott, Robert (Server Storage)
2014-10-21 17:53 ` Elliott, Robert (Server Storage)
2014-10-21 10:55 ` [PATCHv7 00/27] scsi logging update (the boring part) Christoph Hellwig
2014-10-21 11:02 ` Hannes Reinecke
2014-10-21 11:04 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413787950-14659-21-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=elliott@hp.com \
--cc=hch@infradead.org \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox