mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-06-17 20:05:11 -07:00
parent c095733a54 810e718997
commit 6751f63b43
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nightly/conf/nightly.conf
+5 -5
View File
@@ -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 \
scst/src/dev_handlers/scst_vdisk.c
+16 -6
View File
@@ -456,13 +456,23 @@ 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
bio_set_op_attrs(bio, REQ_OP_FLUSH, 0);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) || \
(defined(CONFIG_SUSE_KERNEL) && \
LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 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;
} else {