From 76edd32ceb4b4bec3fc8d40abde5b802208297a3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 19 Dec 2018 14:55:58 +0000 Subject: [PATCH] scst: Avoid that RHEL 7.6 complains about WRITE_VERIFY_16 being redefined RHEL7.6 backported the WRITE_VERIFY_16 macro to their 3.10 based kernel (3.10.0-957.*), so do not define WRITE_VERIFY_16 on RHEL7.6 and above. Reported-by: Tomohiro Kusumi git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7842 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst_const.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index c4acfa171..cb0caa2ea 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -371,7 +371,8 @@ static inline int scst_sense_response_code(const uint8_t *sense) && (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5) #define WRITE_ATTRIBUTE 0x8D #endif -#if !defined(__KERNEL__) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) +#if (!defined(__KERNEL__) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) &&\ + !defined(WRITE_VERIFY_16) #define WRITE_VERIFY_16 0x8E #endif #define VERIFY_6 0x13