mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Fix the build against RHEL 8 debug kernels (merge r8886 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.4.x@9110 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2020-08-08 15:24:18 +00:00
parent 16886d2fa3
commit d05aed2445
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scst/include/scst.h
View File

@@ -4867,7 +4867,9 @@ static inline struct scatterlist *sg_next_inline(struct scatterlist *sg)
static inline void sg_clear(struct scatterlist *sg)
{
memset(sg, 0, sizeof(*sg));
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && defined(CONFIG_DEBUG_SG)
#if defined(CONFIG_DEBUG_SG) && \
LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && \
(!defined(RHEL_MAJOR) && RHEL_MAJOR -0 < 8)
sg->sg_magic = SG_MAGIC;
#endif
}

3
scst/src/scst_lib.c
View File

@@ -8549,7 +8549,8 @@ static void scsi_end_async(struct request *req, blk_status_t error)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
lockdep_assert_held(req->q->queue_lock);
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 21, 0)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 21, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8)
if (!req->q->mq_ops)
lockdep_assert_held(req->q->queue_lock);
#endif