diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-15 12:33:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-15 12:33:25 +1100 |
| commit | 99aa1a4851dca62917c770155f9bcc43c6c176d9 (patch) | |
| tree | a9794f651f4f392f484619465711508fddfe641d /include | |
| parent | 573ac670fe8919e2c620d29bceecfdf61f5046d1 (diff) | |
| parent | a9417e74ff41eacd872202f311e0c209754ac7e8 (diff) | |
Merge remote-tracking branch 'scsi/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_cmnd.h | 1 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 7fb57e905526..949a016dd7fa 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -171,7 +171,6 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count, extern void scsi_kunmap_atomic_sg(void *virt); extern int scsi_init_io(struct scsi_cmnd *cmd); -extern void scsi_initialize_rq(struct request *rq); extern int scsi_dma_map(struct scsi_cmnd *cmd); extern void scsi_dma_unmap(struct scsi_cmnd *cmd); diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index a8b7bf879ced..1a1df0d21ee3 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -571,6 +571,8 @@ 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; |