aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_transport_iscsi.c
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2006-06-28 13:00:29 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-06-29 11:08:31 -0400
commite6f3b63f50b4bb9fdc9025e0c3994acd265ad3a2 (patch)
treeec5d681d2b7b203930e6cc1457b4f8aeee91439a /drivers/scsi/scsi_transport_iscsi.c
parentf53a88da18e3c04c3ade07bc5eff520ee4259c3e (diff)
[SCSI] iscsi: rm channel usage from iscsi
I do not remember what I was thinking when we added the channel as a argument to the session create function. It was probably due to too much cut and paste work from the FC transport class. The channel is meaningless for iscsi drivers so this patch drops its usage everywhere in the iscsi related code. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_transport_iscsi.c')
-rw-r--r--drivers/scsi/scsi_transport_iscsi.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 8717ff51ba4b..c0ec502835ee 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -248,10 +248,9 @@ static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,
248 248
249 mutex_lock(&ihost->mutex); 249 mutex_lock(&ihost->mutex);
250 list_for_each_entry(session, &ihost->sessions, host_list) { 250 list_for_each_entry(session, &ihost->sessions, host_list) {
251 if ((channel == SCAN_WILD_CARD || 251 if ((channel == SCAN_WILD_CARD || channel == 0) &&
252 channel == session->channel) &&
253 (id == SCAN_WILD_CARD || id == session->target_id)) 252 (id == SCAN_WILD_CARD || id == session->target_id))
254 scsi_scan_target(&session->dev, session->channel, 253 scsi_scan_target(&session->dev, 0,
255 session->target_id, lun, 1); 254 session->target_id, lun, 1);
256 } 255 }
257 mutex_unlock(&ihost->mutex); 256 mutex_unlock(&ihost->mutex);
@@ -297,7 +296,7 @@ EXPORT_SYMBOL_GPL(iscsi_block_session);
297 **/ 296 **/
298struct iscsi_cls_session * 297struct iscsi_cls_session *
299iscsi_create_session(struct Scsi_Host *shost, 298iscsi_create_session(struct Scsi_Host *shost,
300 struct iscsi_transport *transport, int channel) 299 struct iscsi_transport *transport)
301{ 300{
302 struct iscsi_host *ihost; 301 struct iscsi_host *ihost;
303 struct iscsi_cls_session *session; 302 struct iscsi_cls_session *session;
@@ -322,7 +321,6 @@ iscsi_create_session(struct Scsi_Host *shost,
322 ihost = shost->shost_data; 321 ihost = shost->shost_data;
323 322
324 session->sid = iscsi_session_nr++; 323 session->sid = iscsi_session_nr++;
325 session->channel = channel;
326 session->target_id = ihost->next_target_id++; 324 session->target_id = ihost->next_target_id++;
327 325
328 snprintf(session->dev.bus_id, BUS_ID_SIZE, "session%u", 326 snprintf(session->dev.bus_id, BUS_ID_SIZE, "session%u",