diff options
| author | James Bottomley | 2018-03-27 18:27:34 +0200 |
|---|---|---|
| committer | James Bottomley | 2018-04-04 02:38:39 +0200 |
| commit | 2e1f44f6ad8008be353c7c99286f7a747b4b3cf4 (patch) | |
| tree | 9ab4f369e72a6f1953f53269030bbba047c6be8a /include/scsi/scsi_host.h | |
| parent | scsi: ufs: Add support for Auto-Hibernate Idle Timer (diff) | |
| parent | scsi: qla2xxx: fx00 copypaste typo (diff) | |
| download | kernel-qcow2-linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.gz kernel-qcow2-linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.xz kernel-qcow2-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/scsi_host.h')
| -rw-r--r-- | include/scsi/scsi_host.h | 5 |
1 files changed, 3 insertions, 2 deletions
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; |