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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-04-29 10:48:31 -07:00
parent 317cf2b915 5910f8da1e
commit d76b0b5a96
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
iscsi-scst/README
View File

@@ -183,7 +183,7 @@ is /sys/kernel/scst_tgt/targets/iscsi. It has the following entries:
- allowed_portal[num] - optional attribute, which specifies, on which
portals (target's IP addresses) this target will be available. If not
specified (default) the target will be available on all all portals.
specified (default) the target will be available on all portals.
As soon as at least one allowed_portal specified, the target will be
accessible for initiators only on the specified portals. There might
be any number of the allowed_portal attributes. The portals
@@ -738,7 +738,7 @@ echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal !*' >/sys/ker
will disable all portals.
2. If you want to want to allow only only specific set of initiators be
2. If you want to want to allow only specific set of initiators be
able to connect to your target, you should don't add any default LUNs
for the target and create for allowed initiators a security group to
which they will be assigned.
@@ -852,7 +852,7 @@ simultaneously on both ports, i.e. they transfer data via both ports on
the same speed as via any single port. Thus, using such adapters in MPIO
configuration can't improve performance. To allow MPIO to have double
performance you should either use separate network adapters, or find a
dual-port adapter capable to to transfer data simultaneously on both
dual-port adapter capable to transfer data simultaneously on both
ports. You can check it by running 2 iperf's through both ports in
parallel.

6
iscsi-scst/README_in-tree
View File

@@ -66,7 +66,7 @@ is /sys/kernel/scst_tgt/targets/iscsi. It has the following entries:
- allowed_portal[num] - optional attribute, which specifies, on which
portals (target's IP addresses) this target will be available. If not
specified (default) the target will be available on all all portals.
specified (default) the target will be available on all portals.
As soon as at least one allowed_portal specified, the target will be
accessible for initiators only on the specified portals. There might
be any number of the allowed_portal attributes. The portals
@@ -582,7 +582,7 @@ echo 'add_target_attribute iqn.2006-10.net.vlnb:tgt allowed_portal !*' >/sys/ker
will disable all portals.
2. If you want to want to allow only only specific set of initiators be
2. If you want to want to allow only specific set of initiators be
able to connect to your target, you should don't add any default LUNs
for the target and create for allowed initiators a security group to
which they will be assigned.
@@ -694,7 +694,7 @@ simultaneously on both ports, i.e. they transfer data via both ports on
the same speed as via any single port. Thus, using such adapters in MPIO
configuration can't improve performance. To allow MPIO to have double
performance you should either use separate network adapters, or find a
dual-port adapter capable to to transfer data simultaneously on both
dual-port adapter capable to transfer data simultaneously on both
ports. You can check it by running 2 iperf's through both ports in
parallel.

1
nightly/conf/nightly.conf
View File

@@ -77,6 +77,7 @@ ABT_KERNELS=" \
3.10.0-862.14.4.el7^CentOS^7.5.1804-nc \
2.6.32-754.29.2.el6^CentOS^6.10-nc \
2.6.32-696.30.1.el6^CentOS^6.9-nc \
5.4.17-2102.200.13.el8uek^UEK^8-nc \
5.4.17-2036.101.2.el7uek^UEK^7-nc \
4.14.35-2025.403.3.el7uek^UEK^7-nc \
"

2
scripts/kernel-functions
View File

@@ -690,7 +690,7 @@ time:
This is because both dtc-lexer as well as dtc-parser define the same
global symbol yyloc. Before with -fcommon those were merged into one
defintion. The proper solution would be to to mark this as "extern",
defintion. The proper solution would be to mark this as "extern",
however that leads to:
dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]

3
scst/include/backport.h
View File

@@ -2235,7 +2235,8 @@ fc_host_fpin_rcv(struct Scsi_Host *shost, u32 fpin_len, char *fpin_buf)
* See also commit 62e9dd177732 ("scsi: qla2xxx: Change in PUREX to handle FPIN
* ELS requests").
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) && \
!(defined(UEK_KABI_RENAME) && defined(FC_PORTSPEED_256GBIT))
#define ELS_RDP 0x18
#endif

2
scst/include/scst.h
View File

@@ -2341,7 +2341,7 @@ struct scst_cmd {
uint8_t lba_off; /* LBA offset in cdb */
uint8_t lba_len; /* LBA length in cdb */
uint8_t len_off; /* length offset in cdb */
uint8_t len_len; /* length length in cdb */
uint8_t len_len; /* length of length in cdb */
/* If not zero, logarithm base 2 of the maximum data buffer length. */
uint8_t log2_max_buf_len;
uint32_t op_flags; /* various flags of this opcode */

4
scst/src/scst_lib.c
View File

@@ -542,7 +542,7 @@ struct scst_sdbops {
uint8_t info_lba_off; /* LBA offset in cdb */
uint8_t info_lba_len; /* LBA length in cdb */
uint8_t info_len_off; /* length offset in cdb */
uint8_t info_len_len; /* length length in cdb */
uint8_t info_len_len; /* length of length in cdb */
uint8_t info_data_direction;
/*
* init --> target: SCST_DATA_WRITE
@@ -12171,7 +12171,7 @@ int scst_get_cdb_info(struct scst_cmd *cmd)
ptr->devkey[9], /* commdev */
ptr->info_op_name);
TRACE_DBG("data direction %d, op flags 0x%x, lba off %d, "
"lba len %d, len off %d, len len %d",
"lba len %d, len off %d, len of len %d",
ptr->info_data_direction, ptr->info_op_flags,
ptr->info_lba_off, ptr->info_lba_len,
ptr->info_len_off, ptr->info_len_len);