From 0b1dd369ba2baeb3190abda8fefce5a91ab19a0c Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 18 Jun 2019 01:59:24 +0000
Subject: [PATCH 1/3] nightly build: Update kernel versions

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8428 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 nightly/conf/nightly.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 8b4114f3b..a38c7d438 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,25 +3,25 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.1.10          \
+5.1.11          \
 5.0.20-nc      \
 4.20.17-nc     \
-4.19.51-nc     \
+4.19.52-nc     \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.126-nc    \
+4.14.127-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.181-nc     \
+4.9.182-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \
 4.5.7-nc       \
-4.4.181-nc     \
+4.4.182-nc     \
 4.3.6-nc       \
 4.2.8-nc       \
 4.1.52-nc      \

From 3749561e2f91674611d08fad81b6ba24c89239ef Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 18 Jun 2019 02:59:25 +0000
Subject: [PATCH 2/3] scst_vdisk: Invert an if-condition

This patch does not change any functionality.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8429 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/src/dev_handlers/scst_vdisk.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 8125244f8..3b3952e16 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -456,13 +456,13 @@ static int vdisk_blockio_flush(struct block_device *bdev, gfp_t gfp_mask,
 		bio->bi_end_io = vdev_flush_end_io;
 		bio->bi_private = cmd;
 		bio_set_dev(bio, bdev);
-#if (!defined(CONFIG_SUSE_KERNEL) &&			\
-	LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) || \
-	LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
-		submit_bio(WRITE_FLUSH, bio);
-#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ||	\
+	(defined(CONFIG_SUSE_KERNEL) &&			\
+	 LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
 		bio_set_op_attrs(bio, REQ_OP_FLUSH, 0);
 		submit_bio(bio);
+#else
+		submit_bio(WRITE_FLUSH, bio);
 #endif
 		goto out;
 	} else {

From 810e718997017e4d0e95c2eb0c3e88476ecdc1a7 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 18 Jun 2019 03:00:09 +0000
Subject: [PATCH 3/3] scst_vdisk: Make flushing work with the rbd driver

Some but not all block drivers support REQ_OP_FLUSH. Hence use
REQ_OP_WRITE | REQ_PREFLUSH instead. See also
https://github.com/bvanassche/scst/issues/16.

Reported-by: Tomohiro Kusumi
Fixes: d41307c162e7 ("scst: Port to Linux kernel v4.8") # trunk r6991.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8430 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/src/dev_handlers/scst_vdisk.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 3b3952e16..b9ae11c78 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -459,9 +459,19 @@ static int vdisk_blockio_flush(struct block_device *bdev, gfp_t gfp_mask,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ||	\
 	(defined(CONFIG_SUSE_KERNEL) &&			\
 	 LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
-		bio_set_op_attrs(bio, REQ_OP_FLUSH, 0);
+		/*
+		 * For the introduction of REQ_PREFLUSH, see also commit
+		 * 28a8f0d317bf ("block, drivers, fs: rename REQ_FLUSH to
+		 * REQ_PREFLUSH") # v4.8.
+		 */
+		bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_PREFLUSH);
 		submit_bio(bio);
 #else
+		/*
+		 * For the introduction of WRITE_FLUSH, see also commit
+		 * 4fed947cb311 ("block: implement REQ_FLUSH/FUA based
+		 * interface for FLUSH/FUA requests") # v2.6.37.
+		 */
 		submit_bio(WRITE_FLUSH, bio);
 #endif
 		goto out;