> -----Original Message----- > From: Hannes Reinecke [mailto:hare@xxxxxxx] > Sent: Wednesday, 01 October, 2014 1:23 AM > To: James Bottomley > Cc: Christoph Hellwig; linux-scsi@xxxxxxxxxxxxxxx; Elliott, Robert (Server > Storage); Hannes Reinecke > Subject: [PATCH 21/24] scsi: simplify scsi_log_(send|completion) > > Simplify scsi_log_(send|completion) by externalizing > scsi_mlreturn_string() and always print the command address. > > Reviewed-by: Christoph Hellwig <hch@xxxxxx> > Signed-off-by: Hannes Reinecke <hare@xxxxxxx> > --- > drivers/scsi/constants.c | 39 ++++++++++++++++++++++++++++++++++++--- > drivers/scsi/scsi.c | 43 ++++++------------------------------------- > drivers/scsi/scsi_lib.c | 13 ++++++++++--- > include/scsi/scsi_dbg.h | 3 ++- > 4 files changed, 54 insertions(+), 44 deletions(-) > > diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c > index b131900..207ebef 100644 > --- a/drivers/scsi/constants.c > +++ b/drivers/scsi/constants.c > @@ -1437,19 +1437,52 @@ const char *scsi_driverbyte_string(int result) > } > EXPORT_SYMBOL(scsi_driverbyte_string); > > -void scsi_print_result(struct scsi_cmnd *cmd) > +#ifdef CONFIG_SCSI_CONSTANTS > +#define scsi_mlreturn_name(result) { result, #result } > +static const struct value_name_pair scsi_mlreturn_arr[] = { > + scsi_mlreturn_name(NEEDS_RETRY), > + scsi_mlreturn_name(SUCCESS), > + scsi_mlreturn_name(FAILED), > + scsi_mlreturn_name(QUEUED), > + scsi_mlreturn_name(SOFT_ERROR), > + scsi_mlreturn_name(ADD_TO_MLQUEUE), > + scsi_mlreturn_name(TIMEOUT_ERROR), > + scsi_mlreturn_name(SCSI_RETURN_NOT_HANDLED), > + scsi_mlreturn_name(FAST_IO_FAIL) > +}; SUCCESS is a misleading name to print on commands that were really not successful. Example: [ 5978.573297] sd 2:0:0:8: [sdz] tag#209 Done: SUCCESS Result: hostbyte=DID_OK driverbyte=DRIVER_OK [ 5978.576335] sd 2:0:0:8: [sdz] tag#209 CDB: Test Unit Ready 00 00 00 00 00 00 [ 5978.578721] sd 2:0:0:8: [sdz] tag#209 Sense Key : Unit Attention [current] [ 5978.581177] sd 2:0:0:8: [sdz] tag#209 Add. Sense: Bus device reset function occurred Maybe that mlreturn value should be printed as "COMPLETE" since it is similar to the SAM service responses called COMMAND COMPLETE and FUNCTION COMPLETE. That is a more neutral term. --- Rob Elliott HP Server Storage -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
