aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2011-03-30 14:46:17 -0400
committerJames Bottomley <James.Bottomley@suse.de>2011-05-01 10:56:28 -0400
commit80d79440ad98a660bd6d81e5c06e85581ff6ac46 (patch)
treec1bdbbfa8493dedfb42666100f3d59b7b8f7b727
parent1940ce7317826c230055e826727acb891fb8bece (diff)
[SCSI] qla2xxx: Correct calling contexts of qla2x00_mark_device_lost() in async paths.
The respective done() functions are called from process context, so there's no reason to 'defer' the request. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8575808dbae0..394d03d82c6a 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -397,7 +397,7 @@ qla2x00_async_login_done(struct scsi_qla_host *vha, fc_port_t *fcport,
397 if (data[1] & QLA_LOGIO_LOGIN_RETRIED) 397 if (data[1] & QLA_LOGIO_LOGIN_RETRIED)
398 set_bit(RELOGIN_NEEDED, &vha->dpc_flags); 398 set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
399 else 399 else
400 qla2x00_mark_device_lost(vha, fcport, 1, 1); 400 qla2x00_mark_device_lost(vha, fcport, 1, 0);
401 break; 401 break;
402 case MBS_PORT_ID_USED: 402 case MBS_PORT_ID_USED:
403 fcport->loop_id = data[1]; 403 fcport->loop_id = data[1];
@@ -409,7 +409,7 @@ qla2x00_async_login_done(struct scsi_qla_host *vha, fc_port_t *fcport,
409 rval = qla2x00_find_new_loop_id(vha, fcport); 409 rval = qla2x00_find_new_loop_id(vha, fcport);
410 if (rval != QLA_SUCCESS) { 410 if (rval != QLA_SUCCESS) {
411 fcport->flags &= ~FCF_ASYNC_SENT; 411 fcport->flags &= ~FCF_ASYNC_SENT;
412 qla2x00_mark_device_lost(vha, fcport, 1, 1); 412 qla2x00_mark_device_lost(vha, fcport, 1, 0);
413 break; 413 break;
414 } 414 }
415 qla2x00_post_async_login_work(vha, fcport, NULL); 415 qla2x00_post_async_login_work(vha, fcport, NULL);
@@ -441,7 +441,7 @@ qla2x00_async_adisc_done(struct scsi_qla_host *vha, fc_port_t *fcport,
441 if (data[1] & QLA_LOGIO_LOGIN_RETRIED) 441 if (data[1] & QLA_LOGIO_LOGIN_RETRIED)
442 set_bit(RELOGIN_NEEDED, &vha->dpc_flags); 442 set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
443 else 443 else
444 qla2x00_mark_device_lost(vha, fcport, 1, 1); 444 qla2x00_mark_device_lost(vha, fcport, 1, 0);
445 445
446 return; 446 return;
447} 447}