linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: michaelc@cs.wisc.edu
To: linux-scsi@vger.kernel.org
Subject: [PATCH 2/4] qla4xxx: fix get_host_stats error propagation
Date: Sat, 12 Jul 2014 15:51:49 -0500	[thread overview]
Message-ID: <1405198311-64449-3-git-send-email-michaelc@cs.wisc.edu> (raw)
In-Reply-To: <1405198311-64449-1-git-send-email-michaelc@cs.wisc.edu>

From: Mike Christie <michaelc@cs.wisc.edu>

qla4xxx was not always returning -EXYZ error codes when
qla4xxx_get_host_stats failed.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

---
 drivers/scsi/qla4xxx/ql4_os.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index c5d9564..b79b48c 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1050,6 +1050,7 @@ static int qla4xxx_get_host_stats(struct Scsi_Host *shost, char *buf, int len)
 	if (!ql_iscsi_stats) {
 		ql4_printk(KERN_ERR, ha,
 			   "Unable to allocate memory for iscsi stats\n");
+		ret = -ENOMEM;
 		goto exit_host_stats;
 	}
 
@@ -1058,6 +1059,7 @@ static int qla4xxx_get_host_stats(struct Scsi_Host *shost, char *buf, int len)
 	if (ret != QLA_SUCCESS) {
 		ql4_printk(KERN_ERR, ha,
 			   "Unable to retrieve iscsi stats\n");
+		ret = -EIO;
 		goto exit_host_stats;
 	}
 	host_stats->mactx_frames = le64_to_cpu(ql_iscsi_stats->mac_tx_frames);
-- 
1.7.1


  parent reply	other threads:[~2014-07-12 20:52 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-12 20:51 [PATCH 0/4] iscsi: iscsi changes for 3.17 michaelc
2014-07-12 20:51 ` [PATCH 1/4] iscsi class: fix get_host_stats error handling michaelc
2014-07-30 12:50   ` Hannes Reinecke
2014-07-31 22:32     ` Mike Christie
2014-08-01 13:31       ` Hannes Reinecke
2014-08-01 16:10         ` Mike Christie
2014-07-12 20:51 ` michaelc [this message]
2014-07-30 12:51   ` [PATCH 2/4] qla4xxx: fix get_host_stats error propagation Hannes Reinecke
2014-07-12 20:51 ` [PATCH 3/4] iscsi class: fix get_host_stats return code when not supported michaelc
2014-07-30 12:52   ` Hannes Reinecke
2014-07-12 20:51 ` [PATCH 4/4] libiscsi: return new error code when nop times out michaelc
2014-07-30 12:52   ` Hannes Reinecke
2014-07-13  9:50 ` [PATCH 0/4] iscsi: iscsi changes for 3.17 Christoph Hellwig
2014-07-30 12:51   ` Vikas Chaudhary
2014-07-30 11:43 ` 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=1405198311-64449-3-git-send-email-michaelc@cs.wisc.edu \
    --to=michaelc@cs.wisc.edu \
    --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;
as well as URLs for NNTP newsgroup(s).