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

Merge r7421 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7674 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 04:11:27 +00:00
parent 01b01f5e23
commit 4219f00e10
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scst/include/backport.h
View File

@@ -90,16 +90,6 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
}
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
static inline void blk_queue_flag_set(unsigned int flag,
struct request_queue *q)
{
#if !defined(RHEL_MAJOR) || RHEL_MAJOR -0 >= 6
queue_flag_set_unlocked(flag, q);
#endif
}
#endif
/* <linux/compiler.h> */
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20)

2
scst/include/scst.h
View File

@@ -4975,7 +4975,7 @@ static inline struct scatterlist *sg_next_inline(struct scatterlist *sg)
static inline void sg_clear(struct scatterlist *sg)
{
memset(sg, 0, sizeof(*sg));
#ifdef CONFIG_DEBUG_SG
#if 0 // def CONFIG_DEBUG_SG
sg->sg_magic = SG_MAGIC;
#endif
}

7
scst_local/scst_local.c
View File

@@ -1230,7 +1230,14 @@ static int scst_local_change_queue_depth(struct scsi_device *sdev, int qdepth)
static int scst_local_slave_alloc(struct scsi_device *sdev)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
#if !defined(RHEL_MAJOR) || RHEL_MAJOR -0 >= 6
queue_flag_set_unlocked(QUEUE_FLAG_BIDI, sdev->request_queue);
#endif
#else
blk_queue_flag_set(QUEUE_FLAG_BIDI, sdev->request_queue);
#endif
return 0;
}