From 99a7133b30639d9ff37a26d2cb3be695c9e58cb3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 03:41:50 +0000 Subject: [PATCH] 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 --- scst/include/backport.h | 10 ++++++++++ scst_local/scst_local.c | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 15b4bd634..7de532cf6 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -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 + /* */ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20) diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index 2f80fe05b..5fbf98d49 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -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; }