diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-03 18:16:50 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-03 18:16:50 +1000 |
| commit | 25a5c8f2f7f248163dd11984ebde095f2c851d6f (patch) | |
| tree | b8700702f451b70e06c62cf48d0cb09147926b8a /drivers/scsi/scsi_transport_fc.c | |
| parent | 8986f5658ecf19461da37cdded77b366463cf612 (diff) | |
Revert "Merge commit 'block/for-next'"
This reverts commit 305e6d2b61e0279d56488e20dce3d2af85b94ce3.
Diffstat (limited to 'drivers/scsi/scsi_transport_fc.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 9168883d0dfe..56823fd1fb84 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -1950,15 +1950,15 @@ static int fc_vport_match(struct attribute_container *cont, * Notes: * This routine assumes no locks are held on entry. */ -static enum blk_eh_timer_return +static enum scsi_eh_timer_return fc_timed_out(struct scsi_cmnd *scmd) { struct fc_rport *rport = starget_to_rport(scsi_target(scmd->device)); if (rport->port_state == FC_PORTSTATE_BLOCKED) - return BLK_EH_RESET_TIMER; + return EH_RESET_TIMER; - return BLK_EH_NOT_HANDLED; + return EH_NOT_HANDLED; } /* |