Skip to content

Commit

Permalink
Merge branch 'scst_390'
Browse files Browse the repository at this point in the history
  • Loading branch information
msmith626 committed Dec 30, 2024
2 parents 2292583 + 9ad7e9a commit bbfb80a
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHECKSUM.MD5
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ b3ce6f476a5b7ea64c583e7d910d2db7 thin-provisioning-tools-0.9.0.tar.gz
5e2bcbbf3018a4a5ce61fc15e264612e crmsh-master_20180520.tar.xz
a4e4976f0cd67507c22442121400532b nmon-16j.tar.xz
b6b86767eb9e7e65100d6ef5f77b8d1f linux_firmware-20190416.tar.xz
5084fdb5991d8b9c2695369d60a59158 scst-3.7.x_20230120.tar.xz
a29baee4c51542ac8df1139279f88dfc scst-3.9.x_20241230.tar.xz
c5bb483ebbf009bcdd02c860ba5689bb munin-c-0.0.13.tar.xz
3561b7716c4c94f15e0b4847622967b1 open-iscsi-2.1.1.tar.gz
512413a285c852195b6240d6a0ad7f5b open-isns-0.99.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion CHECKSUM.SHA256
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ a2508d9933ed8a3f6c8d302280d838d416668a1d914a83c4bd0fb01eaf0676e8 thin-provision
254a352d6e7dfca5a8801259616d9c3ab1ad6b708bf98d4abd96f71d76b364f3 crmsh-master_20180520.tar.xz
a0227efbdce307d060fe634e339a38e1223744b01361b02c4041b8efc54825a9 nmon-16j.tar.xz
9107b8f28373cc0807c96b74dc82bf6a72131ffc9c41e3aca00a6e3dd840fee9 linux_firmware-20190416.tar.xz
1e5995b37536e6b2075cada85ed1fc1d01c42478f695c7c89d8ef2f3eded08c6 scst-3.7.x_20230120.tar.xz
2c02ead3a8b49dbdb3a0e74bae2cca8e24fb7688970a4f7af739ecf6bc8bb162 scst-3.9.x_20241230.tar.xz
c7bdcf830d76a6b14c5920e049ae26fbf85e144378c7ba41da4a1b661dd2b5fe munin-c-0.0.13.tar.xz
dfc1ea37f230f9d116f5b39c795b35be43002d65c81330ccd3878786532b811b open-iscsi-2.1.1.tar.gz
a8febecf888d5a38abfa2fcb290194d993b1a7f5bea0cb61f5cf2e9f9e5273c2 open-isns-0.99.tar.gz
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2024-12-30 Marc A. Smith <[email protected]>

Merge branch 'scst_390'

updated SCST to version 3.9.0

2024-12-10 Marc A. Smith <[email protected]>

Merge branch 'rc_sbd_tweak'
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ dist_files = $(addprefix $(DIST_FILES_DIR)/, \
qlogic_fw-20240820.tar.xz \
iniparser-4.1.tar.gz \
cdk-5.0-20161210.tar.gz \
scst-3.7.x_20230120.tar.xz \
scst-3.9.x_20241230.tar.xz \
kexec-tools-2.0.19.tar.xz \
drbd-utils-9.16.0.tar.gz \
lvm2-2.03.14.tar.xz \
Expand Down
29 changes: 29 additions & 0 deletions misc/scst-3.9.x_20241230.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- a/iscsi-scst/kernel/iscsi.c 2024-12-28 08:44:09.000000000 -0500
+++ b/iscsi-scst/kernel/iscsi.c 2024-12-30 11:55:10.785995470 -0500
@@ -2395,7 +2395,12 @@
*status = ISCSI_RESPONSE_FUNCTION_COMPLETE;
res = 0;
} else {
- *status = ISCSI_RESPONSE_UNKNOWN_TASK;
+ PRINT_WARNING("Aborting out-of-window command ref_cmd_sn=%d (cmd_sn - 2048)=%d cmd_sn=%d",
+ req_hdr->ref_cmd_sn,
+ req_hdr->cmd_sn - 2048,
+ req_hdr->cmd_sn);
+ *status = ISCSI_RESPONSE_FUNCTION_COMPLETE;
+ res = 0;
}
}

--- a/scst/src/dev_handlers/scst_vdisk.c 2024-12-28 08:44:09.000000000 -0500
+++ b/scst/src/dev_handlers/scst_vdisk.c 2024-12-30 11:58:58.458261219 -0500
@@ -3353,8 +3353,8 @@
* "DRBD and other replication/failover SW
* compatibility" section in SCST README.
*/
- PRINT_WARNING("Closed FD on exec. Not active ALUA state or not blocked dev before ALUA state change? (cmd %p, op %s, dev %s)",
- cmd, cmd->op_name, cmd->dev->virt_name);
+ PRINT_WARNING("Closed FD on exec. Not active ALUA state or not blocked dev before ALUA state change? (cmd %p, op %s, dev %s, initiator %s)",
+ cmd, cmd->op_name, cmd->dev->virt_name, cmd->sess->initiator_name);
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_no_medium));
goto err;
}

0 comments on commit bbfb80a

Please sign in to comment.