iscsi regression: check for zero max session cmds

PATCH New [email protected] 1 participant 1 message Feb 26, 2008

Subsystems (2)

SCSI iSCSI

lore

Share & tools

lore

[email protected]

author

2008-02-26 18:35 UTC #0 lore raw

PATCH 1/1 iscsi regression: check for zero max session cmds

From: Mike Christie <[email protected]>

The old tools did not set max session cmds. This is a regression. I removed the check when merging the power of 2 patch.

Signed-off-by Mike Christie <[email protected]>

---
 drivers/scsi/libiscsi.c             |    4 ++--
 drivers/scsi/scsi_transport_iscsi.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/scsi/libiscsi.c +2 -2

index 59f8445..bdd7de7 100644
@@ -1708,8 +1708,8 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
 		qdepth = ISCSI_DEF_CMD_PER_LUN;
 	}
 
-	if (!is_power_of_2(cmds_max) ||
-	    cmds_max >= ISCSI_MGMT_ITT_OFFSET) {
+	if (!is_power_of_2(cmds_max) || cmds_max >= ISCSI_MGMT_ITT_OFFSET ||
+	    cmds_max < 2) {
 		if (cmds_max != 0)
 			printk(KERN_ERR "iscsi: invalid can_queue of %d. "
 			       "can_queue must be a power of 2 and between "

drivers/scsi/scsi_transport_iscsi.c +1 -1

index 9981682..dfb026b 100644
@@ -33,7 +33,7 @@
 #define ISCSI_SESSION_ATTRS 19
 #define ISCSI_CONN_ATTRS 13
 #define ISCSI_HOST_ATTRS 4
-#define ISCSI_TRANSPORT_VERSION "2.0-868"
+#define ISCSI_TRANSPORT_VERSION "2.0-869"
 
 struct iscsi_internal {
 	int daemon_pid;

Signature · 1 line

1.5.1.2