mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-22 05:01:27 +00:00
Merge r7409 from trunk
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7666 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -90,6 +90,16 @@ 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)
|
||||
|
||||
@@ -1230,9 +1230,7 @@ static int scst_local_change_queue_depth(struct scsi_device *sdev, int qdepth)
|
||||
|
||||
static int scst_local_slave_alloc(struct scsi_device *sdev)
|
||||
{
|
||||
#if !defined(RHEL_MAJOR) || RHEL_MAJOR -0 >= 6
|
||||
queue_flag_set_unlocked(QUEUE_FLAG_BIDI, sdev->request_queue);
|
||||
#endif
|
||||
blk_queue_flag_set(QUEUE_FLAG_BIDI, sdev->request_queue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user