Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31ed0bf4 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] iscsi regression: check for zero max session cmds 



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: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent e2396f1e

drivers/scsi/libiscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;