diff options
| author | James Smart <james.smart@emulex.com> | 2013-09-06 12:19:45 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-09-10 20:22:28 -0400 |
| commit | b5a9b2dfe685117d20062e7cb7998df4d786fca7 (patch) | |
| tree | dd0bdb7fc1d7f34e6c6531c7ccfe2849616a9bb1 /drivers/scsi/lpfc/lpfc_sli.h | |
| parent | 9a86ed48408af49207172e590554d82cdb21cdbd (diff) | |
[SCSI] lpfc 8.3.42: Fixed race condition between BSG I/O dispatch and timeout handling
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h index 97617996206d..4b8216df2afd 100644 --- a/drivers/scsi/lpfc/lpfc_sli.h +++ b/drivers/scsi/lpfc/lpfc_sli.h | |||
| @@ -77,7 +77,8 @@ struct lpfc_iocbq { | |||
| 77 | #define LPFC_FIP_ELS_ID_MASK 0xc000 /* ELS_ID range 0-3, non-shifted mask */ | 77 | #define LPFC_FIP_ELS_ID_MASK 0xc000 /* ELS_ID range 0-3, non-shifted mask */ |
| 78 | #define LPFC_FIP_ELS_ID_SHIFT 14 | 78 | #define LPFC_FIP_ELS_ID_SHIFT 14 |
| 79 | 79 | ||
| 80 | uint8_t rsvd2; | 80 | uint8_t iocb_aux_flag; |
| 81 | #define LPFC_IO_CMD_OUTSTANDING 0x01 /* timeout handler abort window */ | ||
| 81 | uint32_t drvrTimeout; /* driver timeout in seconds */ | 82 | uint32_t drvrTimeout; /* driver timeout in seconds */ |
| 82 | uint32_t fcp_wqidx; /* index to FCP work queue */ | 83 | uint32_t fcp_wqidx; /* index to FCP work queue */ |
| 83 | struct lpfc_vport *vport;/* virtual port pointer */ | 84 | struct lpfc_vport *vport;/* virtual port pointer */ |