diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-03 09:32:33 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-03 09:32:33 -0800 |
| commit | be9e2f775f5a3147205c552534c3abf0f9374a13 (patch) | |
| tree | 9c10584796d73f80295d9c238a089f12621db316 /include | |
| parent | e619e6cbecb7fe97a924d625e848605333457b13 (diff) | |
| parent | 3ddda3e4c82dea58933bde8d0f6ef34470c360cb (diff) | |
| download | linux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.gz | |
Merge branch 'mkp-fixes' into fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3fe27f8d91f0..a5f9643f8f7c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -254,6 +254,7 @@ struct queue_limits { unsigned long virt_boundary_mask; unsigned int max_hw_sectors; + unsigned int max_dev_sectors; unsigned int chunk_sectors; unsigned int max_sectors; unsigned int max_segment_size; @@ -958,7 +959,6 @@ extern struct request_queue *blk_init_allocated_queue(struct request_queue *, extern void blk_cleanup_queue(struct request_queue *); extern void blk_queue_make_request(struct request_queue *, make_request_fn *); extern void blk_queue_bounce_limit(struct request_queue *, u64); -extern void blk_limits_max_hw_sectors(struct queue_limits *, unsigned int); extern void blk_queue_max_hw_sectors(struct request_queue *, unsigned int); extern void blk_queue_chunk_sectors(struct request_queue *, unsigned int); extern void blk_queue_max_segments(struct request_queue *, unsigned short); diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index ed527121031d..fcfa3d7f5e7e 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -668,6 +668,9 @@ struct Scsi_Host { unsigned use_blk_mq:1; unsigned use_cmd_list:1; + /* Host responded with short (<36 bytes) INQUIRY result */ + unsigned short_inquiry:1; + /* * Optional work queue to be utilized by the transport */ |