mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 10:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-12-21 15:37:43 -08:00
parent 808a8bd0bc 73de09a7cb
commit bf64845f97
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nightly/conf/nightly.conf
View File

@@ -3,28 +3,28 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
5.4.1 \
5.3.14-nc \
5.4.6 \
5.3.18-nc \
5.2.21-nc \
5.1.21-nc \
5.0.21-nc \
4.20.17-nc \
4.19.86-nc \
4.19.91-nc \
4.18.20-nc \
4.17.19-nc \
4.16.18-nc \
4.15.18-nc \
4.14.156-nc \
4.14.160-nc \
4.13.16-nc \
4.12.14-nc \
4.11.12-nc \
4.10.17-nc \
4.9.205-nc \
4.9.207-nc \
4.8.17-nc \
4.7.10-nc \
4.6.7-nc \
4.5.7-nc \
4.4.205-nc \
4.4.207-nc \
4.3.6-nc \
4.2.8-nc \
4.1.52-nc \
@@ -32,7 +32,7 @@ ABT_KERNELS=" \
3.19.8-nc \
3.18.140-nc \
3.17.8-nc \
3.16.78-nc \
3.16.80-nc \
3.15.10-nc \
3.14.79-nc \
3.13.11-nc \

6
scst/src/scst_lib.c
View File

@@ -8294,7 +8294,7 @@ static struct request *__blk_map_kern_sg(struct request_queue *q,
}
rq = blk_make_request(q, hbio, gfp_mask);
if (unlikely(IS_ERR(rq)))
if (IS_ERR(rq))
goto out_free_bios;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)
@@ -8371,11 +8371,11 @@ static struct request *blk_map_kern_sg(struct request_queue *q,
}
rq = __blk_map_kern_sg(q, sgl, nents, NULL, gfp, reading);
if (unlikely(IS_ERR(rq))) {
if (IS_ERR(rq)) {
struct blk_kern_sg_work *bw;
bw = blk_copy_kern_sg(q, sgl, nents, gfp, reading);
if (unlikely(IS_ERR(bw))) {
if (IS_ERR(bw)) {
rq = ERR_PTR(PTR_ERR(bw));
goto out;
}