Commit 116f7d4a authored May 06, 2016 by Javier González Committed by Jens Axboe May 06, 2016

lightnvm: reserved space calculation incorrect



The nvm_dev->max_pages_per_blk variable was removed in favor of the new
nvm->sec_per_blk variable. The ->max_pages_per_blk variable was still
used in rrpc_capacity, reporting the reserved capacity to zero. Replace
with ->sec_per_blk to calculate the reserved area again.

Signed-off-by: Javier González <javier@cnexlabs.com>
Updated patch description. Was "lightnvm: eliminate redundant variable"
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 6d5be959

drivers/lightnvm/rrpc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1264,7 +1264,7 @@ static sector_t rrpc_capacity(void *private)
		sector_t reserved, provisioned;

		/* cur, gc, and two emergency blocks for each lun */
		reserved = rrpc->nr_luns * dev->max_pages_per_blk * 4;
		reserved = rrpc->nr_luns * dev->sec_per_blk * 4;
		provisioned = rrpc->nr_sects - reserved;

		if (reserved > rrpc->nr_sects) {

include/linux/lightnvm.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -351,7 +351,6 @@ struct nvm_dev {
		unsigned long total_blocks;
		unsigned long total_secs;
		int nr_luns;
		unsigned max_pages_per_blk;

		unsigned long *lun_map;
		void *dma_pool;

Admin message