diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-05-27 05:17:10 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-05-27 05:17:10 -0600 |
| commit | d92f79a55232405d66ca343294f873cefd04ddd7 (patch) | |
| tree | 2dae0e98d542d1b1c4fd5273f7775a34ce668375 /include | |
| parent | 263c61581a38d0a5ad1f5f4a9143b27d68caeffd (diff) | |
| parent | 6b6e89636f51581895922780c3c4fd51bb9e1483 (diff) | |
Merge branch 'nvme-5.8' of git://git.infradead.org/nvme into for-5.8/drivers
Pull NVMe updates from Christoph:
"The second large batch of nvme updates:
- t10 protection information support for nvme-rdma and nvmet-rdma
(Israel Rukshin and Max Gurtovoy)
- target side AEN improvements (Chaitanya Kulkarni)
- various fixes and minor improvements all over, icluding the nvme part
of the lpfc driver"
* 'nvme-5.8' of git://git.infradead.org/nvme: (38 commits)
lpfc: Fix return value in __lpfc_nvme_ls_abort
lpfc: fix axchg pointer reference after free and double frees
lpfc: Fix pointer checks and comments in LS receive refactoring
nvme: set dma alignment to qword
nvmet: cleanups the loop in nvmet_async_events_process
nvmet: fix memory leak when removing namespaces and controllers concurrently
nvmet-rdma: add metadata/T10-PI support
nvmet: add metadata support for block devices
nvmet: add metadata/T10-PI support
nvme: add Metadata Capabilities enumerations
nvmet: rename nvmet_check_data_len to nvmet_check_transfer_len
nvmet: rename nvmet_rw_len to nvmet_rw_data_len
nvmet: add metadata characteristics for a namespace
nvme-rdma: add metadata/T10-PI support
nvme-rdma: introduce nvme_rdma_sgl structure
nvme: introduce NVME_INLINE_METADATA_SG_CNT
nvme: enforce extended LBA format for fabrics metadata
nvme: introduce max_integrity_segments ctrl attribute
nvme: make nvme_ns_has_pi accessible to transports
nvme: introduce NVME_NS_METADATA_SUPPORTED flag
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/genhd.h | 4 | ||||
| -rw-r--r-- | include/linux/nvme.h | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index f9c226f9546a..2590bed6e6b3 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -169,8 +169,6 @@ struct disk_part_tbl { struct disk_events; struct badblocks; -#if defined(CONFIG_BLK_DEV_INTEGRITY) - struct blk_integrity { const struct blk_integrity_profile *profile; unsigned char flags; @@ -179,8 +177,6 @@ struct blk_integrity { unsigned char tag_size; }; -#endif /* CONFIG_BLK_DEV_INTEGRITY */ - struct gendisk { /* major, first_minor and minors are input parameters only, * don't use directly. Use disk_devt() and disk_max_parts(). diff --git a/include/linux/nvme.h b/include/linux/nvme.h index b235a48eac8c..5ce51ab4c50e 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -420,6 +420,12 @@ enum { NVME_NS_DPS_PI_TYPE3 = 3, }; +/* Identify Namespace Metadata Capabilities (MC): */ +enum { + NVME_MC_EXTENDED_LBA = (1 << 0), + NVME_MC_METADATA_PTR = (1 << 1), +}; + struct nvme_ns_id_desc { __u8 nidt; __u8 nidl; @@ -1185,7 +1191,7 @@ struct nvmf_disc_rsp_page_hdr { __le64 numrec; __le16 recfmt; __u8 resv14[1006]; - struct nvmf_disc_rsp_page_entry entries[0]; + struct nvmf_disc_rsp_page_entry entries[]; }; enum { |