diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 17:56:54 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-05 17:56:54 -0400 |
| commit | c00aafcd4977769e8728292302ddbbb8b1082fab (patch) | |
| tree | 5766bcfbfd7b24816b54298b8ef34054f8cf0fae /drivers/scsi/libiscsi.c | |
| parent | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/scsi/libiscsi.c')
| -rw-r--r-- | drivers/scsi/libiscsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 716cc344c5df..a751f6230c22 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
| @@ -1974,10 +1974,10 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) | |||
| 1974 | * good and have never sent us a successful tmf response | 1974 | * good and have never sent us a successful tmf response |
| 1975 | * then sent more data for the cmd. | 1975 | * then sent more data for the cmd. |
| 1976 | */ | 1976 | */ |
| 1977 | spin_lock(&session->lock); | 1977 | spin_lock_bh(&session->lock); |
| 1978 | fail_scsi_task(task, DID_ABORT); | 1978 | fail_scsi_task(task, DID_ABORT); |
| 1979 | conn->tmf_state = TMF_INITIAL; | 1979 | conn->tmf_state = TMF_INITIAL; |
| 1980 | spin_unlock(&session->lock); | 1980 | spin_unlock_bh(&session->lock); |
| 1981 | iscsi_start_tx(conn); | 1981 | iscsi_start_tx(conn); |
| 1982 | goto success_unlocked; | 1982 | goto success_unlocked; |
| 1983 | case TMF_TIMEDOUT: | 1983 | case TMF_TIMEDOUT: |