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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-05-23 10:24:19 -07:00
parent d040efb700 8a393a319b
commit 953106bb07
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iscsi-scst/usr/isns_proto.h
View File

@@ -38,7 +38,7 @@ struct isns_hdr {
struct isns_tlv {
uint32_t tag;
uint32_t length;
uint32_t value[0];
uint32_t value[];
} __attribute__ ((packed));
/* Commands and responses (4.1.3) */

14
scst/src/scst_lib.c
View File

@@ -8357,20 +8357,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;