diff --git a/iscsi-scst/usr/isns_proto.h b/iscsi-scst/usr/isns_proto.h
index 5a86b39a8..84438f9cd 100644
--- a/iscsi-scst/usr/isns_proto.h
+++ b/iscsi-scst/usr/isns_proto.h
@@ -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) */
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 74a80d107..4b31c9333 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -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;