nvme: remove unused struct nvme_ns fields

And move the flags for the flags field near that field while touching
this area.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 9b959ee18cb672501b472e6022852eabc54afad9..936c4056d98ebecb05ee285852465741296b28ea 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -211,13 +211,9 @@ struct nvme_ns {
        bool ext;
        u8 pi_type;
        unsigned long flags;
-       u16 noiob;
-
 #define NVME_NS_REMOVING 0
 #define NVME_NS_DEAD     1
-
-       u64 mode_select_num_blocks;
-       u32 mode_select_block_len;
+       u16 noiob;
 };
 
 struct nvme_ctrl_ops {