diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-03-06 17:37:53 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-03-06 17:37:53 +0100 |
| commit | e24bce8fb4c26bd0d8eca74cbbee1ad049246be3 (patch) | |
| tree | c219c2ec183633aa15841fca5b055a09d2d0b980 /include/scsi/scsi_transport_fc.h | |
| parent | ARM: OMAP2+: Release device node after it is no longer needed. (diff) | |
| parent | Linux 4.11-rc1 (diff) | |
| download | linux-e24bce8fb4c26bd0d8eca74cbbee1ad049246be3.tar.xz linux-e24bce8fb4c26bd0d8eca74cbbee1ad049246be3.zip | |
Merge tag 'v4.11-rc1' into omap-for-v4.11/fixes
Linux 4.11-rc1
Diffstat (limited to 'include/scsi/scsi_transport_fc.h')
| -rw-r--r-- | include/scsi/scsi_transport_fc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index 924c8e614b45..b21b8aa58c4d 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h @@ -808,6 +808,7 @@ struct fc_vport *fc_vport_create(struct Scsi_Host *shost, int channel, struct fc_vport_identifiers *); int fc_vport_terminate(struct fc_vport *vport); int fc_block_scsi_eh(struct scsi_cmnd *cmnd); +enum blk_eh_timer_return fc_eh_timed_out(struct scsi_cmnd *scmd); static inline struct Scsi_Host *fc_bsg_to_shost(struct bsg_job *job) { |