diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-07-11 08:12:31 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-07-11 08:12:31 -0600 |
| commit | b7403066070d96fa3db23a4df6910f15c46ffc6d (patch) | |
| tree | fc2e1400595e7127a8590aa5f43d41263eb760d2 /include/linux | |
| parent | 4ddeaae8903d703201e493e2d19dc9ac9acf2c76 (diff) | |
| parent | 420dc733f980246f2179e0144f9cedab9ad4a91e (diff) | |
Merge branch 'nvme-5.3' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Christoph:
"Lof of fixes all over the place, and two very minor features that
were in the nvme tree by the end of the merge window, but hadn't made
it out to Jens yet."
* 'nvme-5.3' of git://git.infradead.org/nvme:
nvme: fix regression upon hot device removal and insertion
nvme-fc: fix module unloads while lports still pending
nvme-tcp: don't use sendpage for SLAB pages
nvme-tcp: set the STABLE_WRITES flag when data digests are enabled
nvmet: print a hint while rejecting NSID 0 or 0xffffffff
nvme-multipath: do not select namespaces which are about to be removed
nvme-multipath: also check for a disabled path if there is a single sibling
nvme-multipath: factor out a nvme_path_is_disabled helper
nvme: set physical block size and optimal I/O size
nvme: add I/O characteristics fields
nvmet: export I/O characteristics attributes in Identify
nvme-trace: add delete completion and submission queue to admin cmds tracer
nvme-trace: fix spelling mistake "spcecific" -> "specific"
nvme-pci: limit max_hw_sectors based on the DMA max mapping size
nvme-pci: check for NULL return from pci_alloc_p2pmem()
nvme-pci: don't create a read hctx mapping without read queues
nvme-pci: don't fall back to a 32-bit DMA mask
nvme-pci: make nvme_dev_pm_ops static
nvme-fcloop: resolve warnings on RCU usage and sleep warnings
nvme-fcloop: fix inconsistent lock state warnings
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvme.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index d98b2d8baf4e..01aa6a6c241d 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -315,7 +315,7 @@ struct nvme_id_ns { __u8 nmic; __u8 rescap; __u8 fpi; - __u8 rsvd33; + __u8 dlfeat; __le16 nawun; __le16 nawupf; __le16 nacwu; @@ -324,11 +324,17 @@ struct nvme_id_ns { __le16 nabspf; __le16 noiob; __u8 nvmcap[16]; - __u8 rsvd64[28]; + __le16 npwg; + __le16 npwa; + __le16 npdg; + __le16 npda; + __le16 nows; + __u8 rsvd74[18]; __le32 anagrpid; __u8 rsvd96[3]; __u8 nsattr; - __u8 rsvd100[4]; + __le16 nvmsetid; + __le16 endgid; __u8 nguid[16]; __u8 eui64[8]; struct nvme_lbaf lbaf[16]; |