From 1eeb9893f24923bd82f7b85e69aa0eb4893955f7 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Oct 2015 21:28:39 +0000 Subject: [PATCH 1/6] nightly build: Update kernel versions git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6525 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 1d46474a4..2ff8ad5bf 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -11,11 +11,11 @@ ABT_KERNELS=" \ 3.17.8-nc \ 3.16.7-nc \ 3.15.10-nc \ -3.14.53-nc \ +3.14.54-nc \ 3.13.11-nc \ 3.12.44-nc \ 3.11.10-nc \ -3.10.89-nc \ +3.10.90-nc \ 3.9.11-nc \ 3.8.13-nc \ 3.7.10-nc \ From d84effde0a5e64f3f09b3dc6270803a28010bc54 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 2 Oct 2015 02:30:13 +0000 Subject: [PATCH 2/6] Ignore DID_TARGET_FAILURE if status already set git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6526 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_targ.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 0380d73fe..dc66d98d7 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -3547,6 +3547,8 @@ static bool scst_check_auto_sense(struct scst_cmd *cmd) scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_write_error)); else scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_read_error)); + } else if ((cmd->host_status == DID_TARGET_FAILURE) && (cmd->status != 0)) { + /* It's OK, normal workflow, ignore */ } else { TRACE(TRACE_SCSI|TRACE_MINOR_AND_MGMT_DBG, "Host " "status 0x%x received, returning HARDWARE ERROR " From 6124bf060838d70dfa8de3c03512a4d5f108b2e4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 2 Oct 2015 16:09:58 +0000 Subject: [PATCH 3/6] scst_debug.h: Use tabs for indentation instead of spaces Detected by checkpatch. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6527 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst_debug.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h index dc8c9e1b6..6941a55ea 100644 --- a/scst/include/scst_debug.h +++ b/scst/include/scst_debug.h @@ -44,27 +44,27 @@ #endif #define pr_emerg(fmt, ...) \ - printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__) #define pr_alert(fmt, ...) \ - printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__) #define pr_crit(fmt, ...) \ - printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__) #define pr_err(fmt, ...) \ - printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) #define pr_warning(fmt, ...) \ - printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) #define pr_notice(fmt, ...) \ - printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) #endif #ifndef pr_info #define pr_info(fmt, ...) \ - printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) #endif #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) #ifndef pr_cont #define pr_cont(fmt, ...) \ - printk(KERN_CONT fmt, ##__VA_ARGS__) + printk(KERN_CONT fmt, ##__VA_ARGS__) #endif #endif From 50848fb0c415625cde423f0c2b4c7eb389aab8ff Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 2 Oct 2015 16:10:35 +0000 Subject: [PATCH 4/6] scst.h: Do not surround return statement expressions with parentheses This avoids that checkpatch reports "return is not a function". git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6528 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index 0d19a44c3..b86f566e3 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -885,7 +885,7 @@ enum scst_dif_actions { /* Returns DIF checks by stripping the action part from a */ static inline enum scst_dif_actions scst_get_dif_checks(enum scst_dif_actions a) { - return (a & SCST_DIF_CHECKS_MASK); + return a & SCST_DIF_CHECKS_MASK; } /* Sets the DIF checks part in a */ @@ -900,7 +900,7 @@ static inline void scst_set_dif_checks(enum scst_dif_actions *a, /* Returns DIF action by stripping the checks part from a */ static inline enum scst_dif_actions scst_get_dif_action(enum scst_dif_actions a) { - return (a & SCST_DIF_ACTION_MASK); + return a & SCST_DIF_ACTION_MASK; } /* Sets the DIF action part in a */ From 00301a314b8169de41157414fd8d4d172f54e17f Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 3 Oct 2015 04:33:27 +0000 Subject: [PATCH 5/6] scst_const.h: Add DID_TARGET_FAILURE for older kernel versions git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6529 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst_const.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index 7d8ded58d..cdb4a4a6a 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -646,6 +646,11 @@ enum scst_tg_sup { #define DID_TRANSPORT_FAILFAST 0xf #endif +/* See also patch "Add detailed SCSI I/O errors" (commit ID 63583cca745f) */ +#ifndef DID_TARGET_FAILURE +#define DID_TARGET_FAILURE 0x10 +#endif + #ifndef DID_NEXUS_FAILURE #define DID_NEXUS_FAILURE 0x11 #endif From 6bf6dd8d1f75efdace2ac1765116a47bca7cf51d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 3 Oct 2015 20:35:11 +0000 Subject: [PATCH 6/6] nightly build: Update kernel versions git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6530 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 2ff8ad5bf..8ccddc98d 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -3,8 +3,8 @@ ABT_DETAILS="x86_64" ABT_JOBS=5 ABT_KERNELS=" \ -4.2.2 \ -4.1.9-nc \ +4.2.3 \ +4.1.10-nc \ 4.0.9-nc \ 3.19.7-nc \ 3.18.19-nc \