From d853a42ba30ee153e9d0bb8d7ca9924634392bfc Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Nov 2018 04:39:58 +0000 Subject: [PATCH] scst_lib: Kernel v4.14.x (x>=11) build fix git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7583 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 0a2c5842f..b6b5f4a01 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -7979,7 +7979,12 @@ static struct request *blk_make_request(struct request_queue *q, blk_put_request(rq); return ERR_PTR(ret); } -#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + /* + * See also commit commit 0abc2a10389f ("block: fix + * blk_rq_append_bio"). That commit has been backported to + * kernel v4.14.11 as 88da02868f77. + */ +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 11) ret = blk_rq_append_bio(rq, bio); if (unlikely(ret)) { blk_put_request(rq);