diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2014-07-01 12:24:38 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-07-25 17:16:54 -0400 |
commit | 915aafd856d1a4ef1dea30c2b20ada03c93be4d7 (patch) | |
tree | 3a082f61e17cb2920839eb9f1bdf7964a560919a /drivers | |
parent | a799cb770c51fe3cabc64b3672d224c7f2c613a3 (diff) |
bnx2i, be2iscsi: fix custom stats length
The custom stats is an array with custom_length indicating the length
of the array. This patch fixes bnx2i and be2iscsi's setting of the
custom stats length. They both just have the one, eh_abort_cnt, so that should
be in the first entry of the custom array and custom_length should then
be one.
Reported-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Acked-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/be2iscsi/be_iscsi.c | 2 | ||||
-rw-r--r-- | drivers/scsi/bnx2i/bnx2i_iscsi.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c index fd284ff36ecf..86162811812d 100644 --- a/drivers/scsi/be2iscsi/be_iscsi.c +++ b/drivers/scsi/be2iscsi/be_iscsi.c | |||
@@ -914,7 +914,7 @@ void beiscsi_conn_get_stats(struct iscsi_cls_conn *cls_conn, | |||
914 | stats->r2t_pdus = conn->r2t_pdus_cnt; | 914 | stats->r2t_pdus = conn->r2t_pdus_cnt; |
915 | stats->digest_err = 0; | 915 | stats->digest_err = 0; |
916 | stats->timeout_err = 0; | 916 | stats->timeout_err = 0; |
917 | stats->custom_length = 0; | 917 | stats->custom_length = 1; |
918 | strcpy(stats->custom[0].desc, "eh_abort_cnt"); | 918 | strcpy(stats->custom[0].desc, "eh_abort_cnt"); |
919 | stats->custom[0].value = conn->eh_abort_cnt; | 919 | stats->custom[0].value = conn->eh_abort_cnt; |
920 | } | 920 | } |
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index 166543f7ef55..9bd9b8148689 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c | |||
@@ -1643,12 +1643,11 @@ static void bnx2i_conn_get_stats(struct iscsi_cls_conn *cls_conn, | |||
1643 | stats->r2t_pdus = conn->r2t_pdus_cnt; | 1643 | stats->r2t_pdus = conn->r2t_pdus_cnt; |
1644 | stats->tmfcmd_pdus = conn->tmfcmd_pdus_cnt; | 1644 | stats->tmfcmd_pdus = conn->tmfcmd_pdus_cnt; |
1645 | stats->tmfrsp_pdus = conn->tmfrsp_pdus_cnt; | 1645 | stats->tmfrsp_pdus = conn->tmfrsp_pdus_cnt; |
1646 | stats->custom_length = 3; | ||
1647 | strcpy(stats->custom[2].desc, "eh_abort_cnt"); | ||
1648 | stats->custom[2].value = conn->eh_abort_cnt; | ||
1649 | stats->digest_err = 0; | 1646 | stats->digest_err = 0; |
1650 | stats->timeout_err = 0; | 1647 | stats->timeout_err = 0; |
1651 | stats->custom_length = 0; | 1648 | strcpy(stats->custom[0].desc, "eh_abort_cnt"); |
1649 | stats->custom[0].value = conn->eh_abort_cnt; | ||
1650 | stats->custom_length = 1; | ||
1652 | } | 1651 | } |
1653 | 1652 | ||
1654 | 1653 | ||