Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328780
b: refs/heads/master
c: 908e18e
h: refs/heads/master
v: v3
  • Loading branch information
James Smart authored and James Bottomley committed Sep 14, 2012
1 parent db4610c commit 7db8955
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 582dd796fbea1c7cc72c0856c005880fc3e0433f
refs/heads/master: 908e18e4e7a1e77d3cefb227599d653a6907bbb4
8 changes: 4 additions & 4 deletions trunk/drivers/scsi/lpfc/lpfc_scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -4414,7 +4414,7 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)
DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq);

status = fc_block_scsi_eh(cmnd);
if (status)
if (status != 0 && status != SUCCESS)
return status;

spin_lock_irq(&phba->hbalock);
Expand Down Expand Up @@ -4769,7 +4769,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
}
pnode = rdata->pnode;
status = fc_block_scsi_eh(cmnd);
if (status)
if (status != 0 && status != SUCCESS)
return status;

status = lpfc_chk_tgt_mapped(vport, cmnd);
Expand Down Expand Up @@ -4836,7 +4836,7 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
}
pnode = rdata->pnode;
status = fc_block_scsi_eh(cmnd);
if (status)
if (status != 0 && status != SUCCESS)
return status;

status = lpfc_chk_tgt_mapped(vport, cmnd);
Expand Down Expand Up @@ -4904,7 +4904,7 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)
sizeof(scsi_event), (char *)&scsi_event, LPFC_NL_VENDOR_ID);

status = fc_block_scsi_eh(cmnd);
if (status)
if (status != 0 && status != SUCCESS)
return status;

/*
Expand Down

0 comments on commit 7db8955

Please sign in to comment.