| Message ID | 1462375892-26533-3-git-send-email-javier@cnexlabs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/04/2016 05:31 PM, Javier González wrote: > Eliminate redundant variable that has been superseded by the new > variables emerging from the Open-Channel SSD spec. > > Signed-off-by: Javier González <javier@cnexlabs.com> > --- > drivers/lightnvm/rrpc.c | 2 +- > include/linux/lightnvm.h | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c > index 72aca96..2103e97 100644 > --- a/drivers/lightnvm/rrpc.c > +++ b/drivers/lightnvm/rrpc.c > @@ -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) { > diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h > index 272a98b..67e72f5 100644 > --- a/include/linux/lightnvm.h > +++ b/include/linux/lightnvm.h > @@ -365,7 +365,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; > Thanks Javier. Applied for 4.7. I also updated the patch description. -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c index 72aca96..2103e97 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -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) { diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 272a98b..67e72f5 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -365,7 +365,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;
Eliminate redundant variable that has been superseded by the new variables emerging from the Open-Channel SSD spec. Signed-off-by: Javier González <javier@cnexlabs.com> --- drivers/lightnvm/rrpc.c | 2 +- include/linux/lightnvm.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)