From 98c016989e0e0418e5584a3a7a8202afca51cea7 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 3 Aug 2020 03:17:57 +0000 Subject: [PATCH] scst: Port to Linux kernel v5.8 (merge r8955 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.4.x@9102 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 4358a489a..3cb37dc8f 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -8300,20 +8300,8 @@ static struct request *__blk_map_kern_sg(struct request_queue *q, rq->cmd_type = REQ_TYPE_BLOCK_PC; #endif - if (bw != NULL) { + if (bw) atomic_set(&bw->bios_inflight, bios); -#if (!defined(CONFIG_SUSE_KERNEL) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) || \ - LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) - /* - * See also patch "block: split out request-only flags into a - * new namespace" (commit e806402130c9). - */ - rq->cmd_flags |= REQ_COPY_USER; -#else - rq->rq_flags |= RQF_COPY_USER; -#endif - } out: return rq;