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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2017-03-07 20:59:24 -08:00
parent 7d452207c4 76daca5677
commit 624c72997b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scst/include/backport.h
View File

@@ -54,10 +54,6 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
}
#endif
#ifndef RQF_COPY_USER
#define RQF_COPY_USER REQ_COPY_USER
#endif
/* <linux/compiler.h> */
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20)

10
scst/src/scst_lib.c
View File

@@ -8107,7 +8107,15 @@ static struct request *__blk_map_kern_sg(struct request_queue *q,
if (bw != NULL) {
atomic_set(&bw->bios_inflight, bios);
rq->cmd_flags |= RQF_COPY_USER;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 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: