Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48d663a3 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: enable nvme size compile asserts 



The asserts in _nvme_nvm_check_size are not compiled due to the function
not begin called. Make sure that it is called, and also fix the wrong
sizes of asserts for nvme_nvm_addr_format, and nvme_nvm_bb_tbl, which
checked for number of bits instead of bytes.

Reported-by: default avatarScott Bauer <scott.bauer@intel.com>
Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 7a3de2b3

drivers/nvme/host/lightnvm.c

+4 −2
Original line number Diff line number Diff line
@@ -241,9 +241,9 @@ static inline void _nvme_nvm_check_size(void) 
	BUILD_BUG_ON(sizeof(struct nvme_nvm_l2ptbl) != 64);

	BUILD_BUG_ON(sizeof(struct nvme_nvm_erase_blk) != 64);

	BUILD_BUG_ON(sizeof(struct nvme_nvm_id_group) != 960);

	BUILD_BUG_ON(sizeof(struct nvme_nvm_addr_format) != 128);

	BUILD_BUG_ON(sizeof(struct nvme_nvm_addr_format) != 16);

	BUILD_BUG_ON(sizeof(struct nvme_nvm_id) != 4096);

	BUILD_BUG_ON(sizeof(struct nvme_nvm_bb_tbl) != 512);

	BUILD_BUG_ON(sizeof(struct nvme_nvm_bb_tbl) != 64);

}



static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id)
@@ -797,6 +797,8 @@ int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int node) 
	struct request_queue *q = ns->queue;

	struct nvm_dev *dev;



	_nvme_nvm_check_size();



	dev = nvm_alloc_dev(node);

	if (!dev)

		return -ENOMEM;