From 1c21b1ffb8c79a5b5bd3201ce204bd909b4fa90c Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Tue, 27 Apr 2010 16:29:58 +0000 Subject: [PATCH] Minor cleanups, fixes and updates git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1657 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 4 ++-- iscsi-scst/usr/ctldev.c | 10 +++++----- iscsi-scst/usr/iscsid.c | 2 +- scst/src/scst_targ.c | 5 ++++- usr/fileio/common.c | 10 ++++++++-- usr/fileio/common.h | 2 +- www/index.html | 7 +++++++ www/iscsi-scst/index.html | 7 +++++++ www/target_iscsi.html | 21 +++++++++++++++++++++ www/users.html | 4 ++-- 10 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 www/target_iscsi.html diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index fb79674fe..8a33df6ce 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -2338,7 +2338,7 @@ static void execute_task_management(struct iscsi_cmnd *req) int function = req_hdr->function & ISCSI_FUNCTION_MASK; struct scst_rx_mgmt_params params; - TRACE(TRACE_MGMT, "TM fn %d", function); + TRACE(TRACE_MGMT, "iSCSI TM fn %d", function); TRACE_MGMT_DBG("TM req %p, ITT %x, RTT %x, sn %u, con %p", req, cmnd_itt(req), req_hdr->rtt, req_hdr->cmd_sn, conn); @@ -3277,7 +3277,7 @@ static void iscsi_send_task_mgmt_resp(struct iscsi_cmnd *req, int status) TRACE_ENTRY(); TRACE_MGMT_DBG("TM req %p finished", req); - TRACE(TRACE_MGMT, "TM fn %d finished, status %d", fn, status); + TRACE(TRACE_MGMT, "iSCSI TM fn %d finished, status %d", fn, status); rsp = iscsi_alloc_rsp(req); rsp_hdr = (struct iscsi_task_rsp_hdr *)&rsp->pdu.bhs; diff --git a/iscsi-scst/usr/ctldev.c b/iscsi-scst/usr/ctldev.c index dcaa6c255..39b7369fb 100644 --- a/iscsi-scst/usr/ctldev.c +++ b/iscsi-scst/usr/ctldev.c @@ -328,7 +328,7 @@ int kernel_params_get(u32 tid, u64 sid, int type, struct iscsi_param *params) if ((err = ioctl(ctrl_fd, ISCSI_PARAM_GET, &info)) < 0) { err = -errno; - log_debug(1, "Can't get session params for session 0x%" PRIu64 + log_debug(1, "Can't get session params for session 0x%" PRIx64 " (tid %u, err %d): %s\n", sid, tid, err, strerror(errno)); } @@ -370,7 +370,7 @@ int kernel_params_set(u32 tid, u64 sid, int type, u32 partial, if ((err = ioctl(ctrl_fd, ISCSI_PARAM_SET, &info)) < 0) { err = -errno; - log_error("Can't set session params for session 0x%" PRIu64 + log_error("Can't set session params for session 0x%" PRIx64 " (tid %u, type %d, partial %d, err %d): %s\n", sid, tid, type, partial, err, strerror(errno)); } @@ -415,7 +415,7 @@ int kernel_session_create(struct connection *conn) res = ioctl(ctrl_fd, ADD_SESSION, &info); if (res < 0) { res = -errno; - log_error("Can't create sess 0x%" PRIu64 " (tid %d, " + log_error("Can't create sess 0x%" PRIx64 " (tid %d, " "initiator %s): %s\n", conn->sess->sid.id64, conn->tid, conn->sess->initiator, strerror(errno)); } @@ -437,7 +437,7 @@ int kernel_session_destroy(u32 tid, u64 sid) res = ioctl(ctrl_fd, DEL_SESSION, &info); if (res < 0) { res = -errno; - log_debug(2, "Can't destroy sess 0x%" PRIu64 " (tid %d): %s\n", + log_debug(2, "Can't destroy sess 0x%" PRIx64 " (tid %d): %s\n", sid, tid, strerror(errno)); } @@ -462,7 +462,7 @@ int kernel_conn_create(u32 tid, u64 sid, u32 cid, u32 stat_sn, u32 exp_stat_sn, res = ioctl(ctrl_fd, ADD_CONN, &info); if (res < 0) { res = -errno; - log_error("Can't create conn %x (sess 0x%" PRIu64 ", tid %d): %s\n", + log_error("Can't create conn %x (sess 0x%" PRIx64 ", tid %d): %s\n", cid, sid, tid, strerror(errno)); } diff --git a/iscsi-scst/usr/iscsid.c b/iscsi-scst/usr/iscsid.c index 4eceb5b81..1a14e6e3f 100644 --- a/iscsi-scst/usr/iscsid.c +++ b/iscsi-scst/usr/iscsid.c @@ -561,7 +561,7 @@ static void login_start(struct connection *conn) err = init_conn_session_params(conn); if (err != 0) { - log_error("Can't get session params for session 0x%" PRIu64 + log_error("Can't get session params for session 0x%" PRIx64 " (err %d): %s\n", conn->sid.id64, err, strerror(-err)); login_rsp_tgt_err(conn, ISCSI_STATUS_TARGET_ERROR); diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index d9bcc958a..6c3ba1713 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -5490,7 +5490,10 @@ int scst_rx_mgmt_fn(struct scst_session *sess, mcmd->cmd_sn_set = params->cmd_sn_set; mcmd->cmd_sn = params->cmd_sn; - TRACE(TRACE_MGMT, "TM fn %d", params->fn); + if (params->fn <= SCST_TARGET_RESET) + TRACE(TRACE_MGMT, "TM fn %d", params->fn); + else + TRACE_MGMT_DBG("TM fn %d", params->fn); TRACE_MGMT_DBG("sess=%p, tag_set %d, tag %lld, lun_set %d, " "lun=%lld, cmd_sn_set %d, cmd_sn %d, priv %p", sess, diff --git a/usr/fileio/common.c b/usr/fileio/common.c index 03a309dd6..bf3eb8fda 100644 --- a/usr/fileio/common.c +++ b/usr/fileio/common.c @@ -647,8 +647,14 @@ static int do_tm(struct vdisk_cmd *vcmd) TRACE_ENTRY(); - TRACE(TRACE_MGMT, "TM fn %d (sess_h %"PRIx64", cmd_h_to_abort %d)", - cmd->tm_cmd.fn, cmd->tm_cmd.sess_h, cmd->tm_cmd.cmd_h_to_abort); + if (cmd->tm_cmd.fn <= SCST_TARGET_RESET) + TRACE(TRACE_MGMT, "TM fn %d (sess_h %"PRIx64", cmd_h_to_abort " + "%d)", cmd->tm_cmd.fn, cmd->tm_cmd.sess_h, + cmd->tm_cmd.cmd_h_to_abort); + else + TRACE_MGMT_DBG("TM fn %d (sess_h %"PRIx64", cmd_h_to_abort %d)", + cmd->tm_cmd.fn, cmd->tm_cmd.sess_h, + cmd->tm_cmd.cmd_h_to_abort); memset(reply, 0, sizeof(*reply)); reply->cmd_h = cmd->cmd_h; diff --git a/usr/fileio/common.h b/usr/fileio/common.h index 333893f0d..0ed313110 100644 --- a/usr/fileio/common.h +++ b/usr/fileio/common.h @@ -81,7 +81,7 @@ struct vdisk_dev { #endif #endif - struct vdisk_tgt_dev tgt_devs[25]; + struct vdisk_tgt_dev tgt_devs[64]; char *name; /* Name of virtual device, must be <= SCSI Model + 1 */ diff --git a/www/index.html b/www/index.html index c006099cf..c3cb12a84 100644 --- a/www/index.html +++ b/www/index.html @@ -132,6 +132,13 @@ transfers from/to underlying SCSI devices. + +

Certification

+ +

SCST core engine has passed VMware certification as part of + Scale’s Intelligent Clustered Storage technology developed by + Scale Computing.

+

Documentation

diff --git a/www/iscsi-scst/index.html b/www/iscsi-scst/index.html index cea459cf1..2f60e96d3 100644 --- a/www/iscsi-scst/index.html +++ b/www/iscsi-scst/index.html @@ -118,6 +118,13 @@ Tested mostly on i386 and x86_64, but should work on any other supported by Linux platform.

You can find the latest development version of this driver in the SCST SVN. See the download page how to setup access to it.

+ +

Certification

+ +

ISCSI-SCST engine has passed VMware certification as part of + Scale’s Intelligent Clustered Storage technology developed by + Scale Computing.

+

HOWTO Gentoo HOWTO diff --git a/www/target_iscsi.html b/www/target_iscsi.html new file mode 100644 index 000000000..348d81b80 --- /dev/null +++ b/www/target_iscsi.html @@ -0,0 +1,21 @@ + + + + + + +Old iSCSI-SCST page + + + + + + + + diff --git a/www/users.html b/www/users.html index 20de666b6..10848b3a8 100644 --- a/www/users.html +++ b/www/users.html @@ -62,7 +62,7 @@ ID7, Ltd - Axxana + Axxana Data Domain @@ -72,7 +72,7 @@ Enjellic Systems Development - Logicworks + Logicworks