| Message ID | 1447081703-110552-8-git-send-email-hare@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2015-11-09 at 16:08 +0100, Hannes Reinecke wrote: > Use standard logging functions instead of hand-crafted ones. > > Reviewed-by: Bart Van Assche <bvanassche@sandisk.com> > Signed-off-by: Hannes Reinecke <hare@suse.de> > --- > drivers/scsi/device_handler/scsi_dh_alua.c | 27 +++++++++++++------- > ------- > 1 file changed, 13 insertions(+), 14 deletions(-) > > diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c > b/drivers/scsi/device_handler/scsi_dh_alua.c > index 240a5dc..b817963 100644 > --- a/drivers/scsi/device_handler/scsi_dh_alua.c > +++ b/drivers/scsi/device_handler/scsi_dh_alua.c > @@ -23,6 +23,7 @@ > #include <linux/delay.h> > #include <linux/module.h> > #include <scsi/scsi.h> > +#include <scsi/scsi_dbg.h> > #include <scsi/scsi_eh.h> > #include <scsi/scsi_dh.h> > > @@ -194,19 +195,14 @@ static void stpg_endio(struct request *req, int > error) > > if (scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE, > &sense_hdr)) { > - if (!err) { > - err = SCSI_DH_IO; > - goto done; > - } > err = alua_check_sense(h->sdev, &sense_hdr); > if (err == ADD_TO_MLQUEUE) { > err = SCSI_DH_RETRY; > goto done; > } > - sdev_printk(KERN_INFO, h->sdev, > - "%s: stpg sense code: %02x/%02x/%02x\n", > - ALUA_DH_NAME, sense_hdr.sense_key, > - sense_hdr.asc, sense_hdr.ascq); > + sdev_printk(KERN_INFO, h->sdev, "%s: stpg failed\n", > + ALUA_DH_NAME); > + scsi_print_sense_hdr(h->sdev, ALUA_DH_NAME, > &sense_hdr); > err = SCSI_DH_IO; > } else if (error) > err = SCSI_DH_IO; > @@ -532,13 +528,16 @@ static int alua_rtpg(struct scsi_device *sdev, > struct alua_dh_data *h, int wait_ > } > > err = alua_check_sense(sdev, &sense_hdr); > - if (err == ADD_TO_MLQUEUE && time_before(jiffies, > expiry)) > + if (err == ADD_TO_MLQUEUE && time_before(jiffies, > expiry)) { > + sdev_printk(KERN_ERR, sdev, "%s: rtpg > retry\n", > + ALUA_DH_NAME); > + scsi_print_sense_hdr(sdev, ALUA_DH_NAME, > &sense_hdr); > goto retry; > - sdev_printk(KERN_INFO, sdev, > - "%s: rtpg sense code %02x/%02x/%02x\n", > - ALUA_DH_NAME, sense_hdr.sense_key, > - sense_hdr.asc, sense_hdr.ascq); > - err = SCSI_DH_IO; > + } > + sdev_printk(KERN_ERR, sdev, "%s: rtpg failed\n", > + ALUA_DH_NAME); > + scsi_print_sense_hdr(sdev, ALUA_DH_NAME, > &sense_hdr); > + return SCSI_DH_IO; > } > if (err != SCSI_DH_OK) > return err; Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index 240a5dc..b817963 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -23,6 +23,7 @@ #include <linux/delay.h> #include <linux/module.h> #include <scsi/scsi.h> +#include <scsi/scsi_dbg.h> #include <scsi/scsi_eh.h> #include <scsi/scsi_dh.h> @@ -194,19 +195,14 @@ static void stpg_endio(struct request *req, int error) if (scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE, &sense_hdr)) { - if (!err) { - err = SCSI_DH_IO; - goto done; - } err = alua_check_sense(h->sdev, &sense_hdr); if (err == ADD_TO_MLQUEUE) { err = SCSI_DH_RETRY; goto done; } - sdev_printk(KERN_INFO, h->sdev, - "%s: stpg sense code: %02x/%02x/%02x\n", - ALUA_DH_NAME, sense_hdr.sense_key, - sense_hdr.asc, sense_hdr.ascq); + sdev_printk(KERN_INFO, h->sdev, "%s: stpg failed\n", + ALUA_DH_NAME); + scsi_print_sense_hdr(h->sdev, ALUA_DH_NAME, &sense_hdr); err = SCSI_DH_IO; } else if (error) err = SCSI_DH_IO; @@ -532,13 +528,16 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h, int wait_ } err = alua_check_sense(sdev, &sense_hdr); - if (err == ADD_TO_MLQUEUE && time_before(jiffies, expiry)) + if (err == ADD_TO_MLQUEUE && time_before(jiffies, expiry)) { + sdev_printk(KERN_ERR, sdev, "%s: rtpg retry\n", + ALUA_DH_NAME); + scsi_print_sense_hdr(sdev, ALUA_DH_NAME, &sense_hdr); goto retry; - sdev_printk(KERN_INFO, sdev, - "%s: rtpg sense code %02x/%02x/%02x\n", - ALUA_DH_NAME, sense_hdr.sense_key, - sense_hdr.asc, sense_hdr.ascq); - err = SCSI_DH_IO; + } + sdev_printk(KERN_ERR, sdev, "%s: rtpg failed\n", + ALUA_DH_NAME); + scsi_print_sense_hdr(sdev, ALUA_DH_NAME, &sense_hdr); + return SCSI_DH_IO; } if (err != SCSI_DH_OK) return err;