diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2008-02-26 12:35:23 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-02-27 15:52:46 -0800 |
| commit | 31ed0bf439a15363c28c7a239f52eb127cb6feb3 (patch) | |
| tree | f7d49cc36f8d1852afc7f3b5027a1a2bff269534 | |
| parent | e2396f1e4ecd438a15fa653a028b93e95013caa3 (diff) | |
| download | blackbird-op-linux-31ed0bf439a15363c28c7a239f52eb127cb6feb3.tar.gz blackbird-op-linux-31ed0bf439a15363c28c7a239f52eb127cb6feb3.zip | |
[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: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/scsi/libiscsi.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 59f8445eab0d..bdd7de7da39a 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -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 " diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 9981682d5302..dfb026b95a6a 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -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; |
