Commit 80bd68d6 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen

scsi_dh_alua: use standard logging functions

Use standard logging functions instead of hand-crafted ones.
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarEwan Milne <emilne@redhat.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d3692a3d
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/module.h> #include <linux/module.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_dbg.h>
#include <scsi/scsi_eh.h> #include <scsi/scsi_eh.h>
#include <scsi/scsi_dh.h> #include <scsi/scsi_dh.h>
...@@ -194,19 +195,14 @@ static void stpg_endio(struct request *req, int error) ...@@ -194,19 +195,14 @@ static void stpg_endio(struct request *req, int error)
if (scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE, if (scsi_normalize_sense(h->sense, SCSI_SENSE_BUFFERSIZE,
&sense_hdr)) { &sense_hdr)) {
if (!err) {
err = SCSI_DH_IO;
goto done;
}
err = alua_check_sense(h->sdev, &sense_hdr); err = alua_check_sense(h->sdev, &sense_hdr);
if (err == ADD_TO_MLQUEUE) { if (err == ADD_TO_MLQUEUE) {
err = SCSI_DH_RETRY; err = SCSI_DH_RETRY;
goto done; goto done;
} }
sdev_printk(KERN_INFO, h->sdev, sdev_printk(KERN_INFO, h->sdev, "%s: stpg failed\n",
"%s: stpg sense code: %02x/%02x/%02x\n", ALUA_DH_NAME);
ALUA_DH_NAME, sense_hdr.sense_key, scsi_print_sense_hdr(h->sdev, ALUA_DH_NAME, &sense_hdr);
sense_hdr.asc, sense_hdr.ascq);
err = SCSI_DH_IO; err = SCSI_DH_IO;
} else if (error) } else if (error)
err = SCSI_DH_IO; err = SCSI_DH_IO;
...@@ -532,13 +528,16 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h, int wait_ ...@@ -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); 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; goto retry;
sdev_printk(KERN_INFO, sdev, }
"%s: rtpg sense code %02x/%02x/%02x\n", sdev_printk(KERN_ERR, sdev, "%s: rtpg failed\n",
ALUA_DH_NAME, sense_hdr.sense_key, ALUA_DH_NAME);
sense_hdr.asc, sense_hdr.ascq); scsi_print_sense_hdr(sdev, ALUA_DH_NAME, &sense_hdr);
err = SCSI_DH_IO; return SCSI_DH_IO;
} }
if (err != SCSI_DH_OK) if (err != SCSI_DH_OK)
return err; return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment