diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-03-27 12:27:34 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-04-03 17:38:39 -0700 |
| commit | 2e1f44f6ad8008be353c7c99286f7a747b4b3cf4 (patch) | |
| tree | 9ab4f369e72a6f1953f53269030bbba047c6be8a /include/scsi | |
| parent | ad448378825f5746c5fa37718724bc8f4e7b6945 (diff) | |
| parent | 3f6c9be27ae1932410d0af044b074fd2c27945c4 (diff) | |
| download | linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.gz linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.bz2 linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.zip | |
Merge branch 'fixes' into misc
Somewhat nasty merge due to conflicts between "33b28357dd00 scsi:
qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b96473efc
scsi: qla2xxx: Fix FC-NVMe LUN discovery"
Merge is non-trivial and has been verified by Qlogic (Cavium)
Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_cmnd.h | 3 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index d8d4a902a88d..2280b2351739 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -68,6 +68,9 @@ struct scsi_cmnd { struct list_head list; /* scsi_cmnd participates in queue lists */ struct list_head eh_entry; /* entry for the host eh_cmd_q */ struct delayed_work abort_work; + + struct rcu_head rcu; + int eh_eflags; /* Used by error handlr */ /* diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 4e418fb539f8..12f454cb6f61 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -437,6 +437,9 @@ struct scsi_host_template { /* True if the controller does not support WRITE SAME */ unsigned no_write_same:1; + /* True if the low-level driver supports blk-mq only */ + unsigned force_blk_mq:1; + /* * Countdown for host blocking with no commands outstanding. */ @@ -553,8 +556,6 @@ struct Scsi_Host { struct blk_mq_tag_set tag_set; }; - struct rcu_head rcu; - atomic_t host_busy; /* commands actually active on low-level */ atomic_t host_blocked; |