Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SCSI] iscsi class, libiscsi and qla4xxx: convert to new transport host byte values

This patch converts the iscsi drivers to the new host byte values.

v2
Drop some conversions. Want to avoid conflicts with other patches.
v1
initial patch.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

authored by

Mike Christie and committed by
James Bottomley
56d7fcfa a4dfaa6f

+9 -7
+5 -3
drivers/scsi/libiscsi.c
··· 1200 1200 goto reject; 1201 1201 case ISCSI_STATE_RECOVERY_FAILED: 1202 1202 reason = FAILURE_SESSION_RECOVERY_TIMEOUT; 1203 - sc->result = DID_NO_CONNECT << 16; 1203 + sc->result = DID_TRANSPORT_FAILFAST << 16; 1204 1204 break; 1205 1205 case ISCSI_STATE_TERMINATE: 1206 1206 reason = FAILURE_SESSION_TERMINATE; ··· 2333 2333 * flush queues. 2334 2334 */ 2335 2335 spin_lock_bh(&session->lock); 2336 - fail_all_commands(conn, -1, 2337 - STOP_CONN_RECOVER ? DID_BUS_BUSY : DID_ERROR); 2336 + if (STOP_CONN_RECOVER) 2337 + fail_all_commands(conn, -1, DID_TRANSPORT_DISRUPTED); 2338 + else 2339 + fail_all_commands(conn, -1, DID_ERROR); 2338 2340 flush_control_queues(session, conn); 2339 2341 spin_unlock_bh(&session->lock); 2340 2342 mutex_unlock(&session->eh_mutex);
+2 -2
drivers/scsi/qla4xxx/ql4_isr.c
··· 139 139 ha->host_no, cmd->device->channel, 140 140 cmd->device->id, cmd->device->lun)); 141 141 142 - cmd->result = DID_BUS_BUSY << 16; 142 + cmd->result = DID_TRANSPORT_DISRUPTED << 16; 143 143 144 144 /* 145 145 * Mark device missing so that we won't continue to send ··· 243 243 if (atomic_read(&ddb_entry->state) == DDB_STATE_ONLINE) 244 244 qla4xxx_mark_device_missing(ha, ddb_entry); 245 245 246 - cmd->result = DID_BUS_BUSY << 16; 246 + cmd->result = DID_TRANSPORT_DISRUPTED << 16; 247 247 break; 248 248 249 249 case SCS_QUEUE_FULL:
+2 -2
drivers/scsi/scsi_transport_iscsi.c
··· 374 374 err = 0; 375 375 break; 376 376 case ISCSI_SESSION_FAILED: 377 - err = DID_IMM_RETRY << 16; 377 + err = DID_TRANSPORT_DISRUPTED << 16; 378 378 break; 379 379 case ISCSI_SESSION_FREE: 380 - err = DID_NO_CONNECT << 16; 380 + err = DID_TRANSPORT_FAILFAST << 16; 381 381 break; 382 382 default: 383 383 err = DID_NO_CONNECT << 16;