iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lightnvm: reserved space calculation incorrect

Browse Source 
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>
This commit is contained in:
Javier González 2016-05-06 20:03:21 +02:00 committed by Jens Axboe
parent 6d5be9590b
commit 116f7d4a21
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/lightnvm/rrpc.c
View File

@ -1264,7 +1264,7 @@ static sector_t rrpc_capacity(void *private)
sector_t reserved, provisioned; sector_t reserved, provisioned;
/* cur, gc, and two emergency blocks for each lun */ /* 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; provisioned = rrpc->nr_sects - reserved;
if (reserved > rrpc->nr_sects) { if (reserved > rrpc->nr_sects) {

1
include/linux/lightnvm.h
View File

@ -351,7 +351,6 @@ struct nvm_dev {
unsigned long total_blocks; unsigned long total_blocks;
unsigned long total_secs; unsigned long total_secs;
int nr_luns; int nr_luns;
unsigned max_pages_per_blk;
unsigned long *lun_map; unsigned long *lun_map;
void *dma_pool; void *dma_pool;