From 303efb6b111b9e1c33c121420d79dee13a42fec2 Mon Sep 17 00:00:00 2001 From: Yan Burman Date: Sun, 16 Nov 2014 13:54:28 +0000 Subject: [PATCH] Merged revisions 5857-5858 via svnmerge from svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/branches/3.0.x ................ r5857 | vlnb | 2014-11-15 07:35:50 +0200 (Sat, 15 Nov 2014) | 9 lines Merged revisions 5855 via svnmerge from svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk ........ r5855 | vlnb | 2014-11-14 17:44:06 -0800 (Fri, 14 Nov 2014) | 3 lines Ease severity of reporting unsupported REPORT LUNS SELECT REPORT value ........ ................ r5858 | vlnb | 2014-11-15 07:38:28 +0200 (Sat, 15 Nov 2014) | 9 lines Merged revisions 5856 via svnmerge from svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk ........ r5856 | vlnb | 2014-11-14 17:55:27 -0800 (Fri, 14 Nov 2014) | 3 lines Report RX data digest failures by default ........ ................ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5874 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/digest.c | 3 +-- scst/src/scst_targ.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/iscsi-scst/kernel/digest.c b/iscsi-scst/kernel/digest.c index f6ed94418..e9c7c7787 100644 --- a/iscsi-scst/kernel/digest.c +++ b/iscsi-scst/kernel/digest.c @@ -205,8 +205,7 @@ int digest_rx_data(struct iscsi_cmnd *cmnd) cmnd->conn->rpadding); if (unlikely(crc != cmnd->ddigest)) { - TRACE(TRACE_MINOR|TRACE_MGMT_DEBUG, "%s", "RX data digest " - "failed"); + PRINT_ERROR("RX data digest failed, stable pages disabled?"); TRACE_MGMT_DBG("Calculated crc %x, ddigest %x, offset %d", crc, cmnd->ddigest, offset); iscsi_dump_pdu(&cmnd->pdu); diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 579a3857b..036a1d753 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -1853,8 +1853,8 @@ static int scst_report_luns_local(struct scst_cmd *cmd) cmd->driver_status = 0; if ((cmd->cdb[2] != 0) && (cmd->cdb[2] != 2)) { - PRINT_ERROR("Unsupported SELECT REPORT value %x in REPORT " - "LUNS command", cmd->cdb[2]); + TRACE(TRACE_MINOR, "Unsupported SELECT REPORT value %x in " + "REPORT LUNS command", cmd->cdb[2]); scst_set_invalid_field_in_cdb(cmd, 2, 0); goto out_compl; }