diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /drivers/scsi/libiscsi.c | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
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: |