Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull followup block layer updates from Jens Axboe:
 "Two things in this pull request:

   - A block throttle oops fix (marked for stable) from Thadeu.

   - The NVMe fixes/features queued up for 3.20, but merged later in the
     process.  From Keith.  We should have gotten this merged earlier,
     we're ironing out the kinks in the process.  Will be ready for the
     initial pull next series"

* 'for-linus' of git://git.kernel.dk/linux-block:
  blk-throttle: check stats_cpu before reading it from sysfs
  NVMe: Fix potential corruption on sync commands
  NVMe: Remove unused variables
  NVMe: Fix scsi mode select llbaa setting
  NVMe: Fix potential corruption during shutdown
  NVMe: Asynchronous controller probe
  NVMe: Register management handle under nvme class
  NVMe: Update SCSI Inquiry VPD 83h translation
  NVMe: Metadata format support

1 files changed, 25 insertions, 1 deletions

diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h
index 26386cf3db44..aef9a81b2d75 100644
--- a/include/uapi/linux/nvme.h
+++ b/include/uapi/linux/nvme.h
@@ -115,7 +115,13 @@ struct nvme_id_ns {
         __le16                  nawun;
         __le16                  nawupf;
         __le16                  nacwu;
-        __u8                    rsvd40[80];
+        __le16                  nabsn;
+        __le16                  nabo;
+        __le16                  nabspf;
+        __u16                   rsvd46;
+        __le64                  nvmcap[2];
+        __u8                    rsvd64[40];
+        __u8                    nguid[16];
         __u8                    eui64[8];
         struct nvme_lbaf        lbaf[16];
         __u8                    rsvd192[192];
@@ -124,10 +130,22 @@ struct nvme_id_ns {
 
 enum {
         NVME_NS_FEAT_THIN       = 1 << 0,
+        NVME_NS_FLBAS_LBA_MASK  = 0xf,
+        NVME_NS_FLBAS_META_EXT  = 0x10,
         NVME_LBAF_RP_BEST       = 0,
         NVME_LBAF_RP_BETTER     = 1,
         NVME_LBAF_RP_GOOD       = 2,
         NVME_LBAF_RP_DEGRADED   = 3,
+        NVME_NS_DPC_PI_LAST     = 1 << 4,
+        NVME_NS_DPC_PI_FIRST    = 1 << 3,
+        NVME_NS_DPC_PI_TYPE3    = 1 << 2,
+        NVME_NS_DPC_PI_TYPE2    = 1 << 1,
+        NVME_NS_DPC_PI_TYPE1    = 1 << 0,
+        NVME_NS_DPS_PI_FIRST    = 1 << 3,
+        NVME_NS_DPS_PI_MASK     = 0x7,
+        NVME_NS_DPS_PI_TYPE1    = 1,
+        NVME_NS_DPS_PI_TYPE2    = 2,
+        NVME_NS_DPS_PI_TYPE3    = 3,
 };
 
 struct nvme_smart_log {
@@ -261,6 +279,10 @@ enum {
         NVME_RW_DSM_LATENCY_LOW         = 3 << 4,
         NVME_RW_DSM_SEQ_REQ             = 1 << 6,
         NVME_RW_DSM_COMPRESSED          = 1 << 7,
+        NVME_RW_PRINFO_PRCHK_REF        = 1 << 10,
+        NVME_RW_PRINFO_PRCHK_APP        = 1 << 11,
+        NVME_RW_PRINFO_PRCHK_GUARD      = 1 << 12,
+        NVME_RW_PRINFO_PRACT            = 1 << 13,
 };
 
 struct nvme_dsm_cmd {
@@ -549,6 +571,8 @@ struct nvme_passthru_cmd {
         __u32   result;
 };
 
+#define NVME_VS(major, minor) (((major) << 16) | ((minor) << 8))
+
 #define nvme_admin_cmd nvme_passthru_cmd
 
 #define NVME_IOCTL_ID           _IO('N', 0x40)