From 675d0174d344d8a7c6763d951c9f27a7cceb67b3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:43:11 +0000 Subject: [PATCH] Merge r7479 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7728 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 2cb19589c..72cc2fa56 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -7925,9 +7925,13 @@ static struct request *blk_make_request(struct request_queue *q, #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) rq = blk_get_request(q, bio_data_dir(bio), gfp_mask); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) rq = blk_get_request(q, bio_data_dir(bio) == READ ? REQ_OP_SCSI_IN : REQ_OP_SCSI_OUT, gfp_mask); +#else + WARN_ON_ONCE(gfp_mask != GFP_KERNEL); + rq = blk_get_request(q, bio_data_dir(bio) == READ ? REQ_OP_SCSI_IN : + REQ_OP_SCSI_OUT, 0); #endif if (IS_ERR(rq)) @@ -8169,9 +8173,13 @@ static struct request *blk_map_kern_sg(struct request_queue *q, if (!sgl) { #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) rq = blk_get_request(q, reading ? READ : WRITE, gfp); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) rq = blk_get_request(q, reading ? REQ_OP_SCSI_IN : REQ_OP_SCSI_OUT, gfp); +#else + WARN_ON_ONCE(gfp != GFP_KERNEL); + rq = blk_get_request(q, reading ? REQ_OP_SCSI_IN : + REQ_OP_SCSI_OUT, 0); #endif if (unlikely(!rq)) return ERR_PTR(-ENOMEM);