mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-09-29 19:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-07-28 21:43:58 -07:00
parent ff0828cb25 e8c99bf813
commit d5ce7eee50
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/scst_lib.c
+13 -13
View File
@@ -8059,7 +8059,14 @@ static struct request *blk_make_request(struct request_queue *q,
struct bio *bio, struct bio *bio,
gfp_t gfp_mask) gfp_t gfp_mask)
{ {
struct request *rq = blk_get_request(q, bio_data_dir(bio), gfp_mask); struct request *rq;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
rq = blk_get_request(q, bio_data_dir(bio), gfp_mask);
#else
rq = blk_get_request(q, bio_data_dir(bio) == READ ? REQ_OP_SCSI_IN :
REQ_OP_SCSI_OUT, gfp_mask);
#endif
if (IS_ERR(rq)) if (IS_ERR(rq))
return rq; return rq;
@@ -8069,12 +8076,6 @@ static struct request *blk_make_request(struct request_queue *q,
#else #else
scsi_req_init(rq); scsi_req_init(rq);
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
rq->cmd_flags = bio_data_dir(bio) == READ ? REQ_OP_SCSI_IN :
REQ_OP_SCSI_OUT;
#else
blk_rq_set_block_pc(rq);
#endif
for_each_bio(bio) { for_each_bio(bio) {
int ret; int ret;
@@ -8259,9 +8260,6 @@ static struct request *__blk_map_kern_sg(struct request_queue *q,
*/ */
rq->cmd_type = REQ_TYPE_BLOCK_PC; rq->cmd_type = REQ_TYPE_BLOCK_PC;
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
rq->cmd_flags = reading ? REQ_OP_SCSI_IN : REQ_OP_SCSI_OUT;
#endif
if (bw != NULL) { if (bw != NULL) {
atomic_set(&bw->bios_inflight, bios); atomic_set(&bw->bios_inflight, bios);
@@ -8307,7 +8305,12 @@ static struct request *blk_map_kern_sg(struct request_queue *q,
struct request *rq; struct request *rq;
if (!sgl) { if (!sgl) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
rq = blk_get_request(q, reading ? READ : WRITE, gfp); rq = blk_get_request(q, reading ? READ : WRITE, gfp);
#else
rq = blk_get_request(q, reading ? REQ_OP_SCSI_IN :
REQ_OP_SCSI_OUT, gfp);
#endif
if (unlikely(!rq)) if (unlikely(!rq))
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@@ -8315,9 +8318,6 @@ static struct request *blk_map_kern_sg(struct request_queue *q,
scsi_req_init(scsi_req(rq)); scsi_req_init(scsi_req(rq));
#else #else
scsi_req_init(rq); scsi_req_init(rq);
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
rq->cmd_flags = reading ? REQ_OP_SCSI_IN : REQ_OP_SCSI_OUT;
#endif #endif
goto out; goto out;
} }