Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / linux / nvme.h

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 0adad4a5419b7cbd7560422de51f9abc97a755a0..8dbd05e70f095b1bd7246677c695693b47e3f5fe 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -117,8 +117,9 @@ struct nvme_ns {
 
        unsigned ns_id;
        int lba_shift;
-       int ms;
-       int pi_type;
+       u16 ms;
+       bool ext;
+       u8 pi_type;
        u64 mode_select_num_blocks;
        u32 mode_select_block_len;
 };