| Message ID | 1460536072-1728-2-git-send-email-ww.tao0320@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/13/2016 10:27 AM, Wenwei Tao wrote: > Since we mainly use soffset in device sector size, we store > that value in rrpc->soffset to reduce doing "(ilog2(dev->sec_size) - 9)". > > Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> > --- > drivers/lightnvm/rrpc.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c > index c0e303c..3143b98 100644 > --- a/drivers/lightnvm/rrpc.c > +++ b/drivers/lightnvm/rrpc.c > @@ -1039,11 +1039,8 @@ static int rrpc_map_init(struct rrpc *rrpc) > { > struct nvm_dev *dev = rrpc->dev; > sector_t i; > - u64 slba; > int ret; > > - slba = rrpc->soffset >> (ilog2(dev->sec_size) - 9); > - > rrpc->trans_map = vzalloc(sizeof(struct rrpc_addr) * rrpc->nr_sects); > if (!rrpc->trans_map) > return -ENOMEM; > @@ -1065,8 +1062,8 @@ static int rrpc_map_init(struct rrpc *rrpc) > return 0; > > /* Bring up the mapping table from device */ > - ret = dev->ops->get_l2p_tbl(dev, slba, rrpc->nr_sects, rrpc_l2p_update, > - rrpc); > + ret = dev->ops->get_l2p_tbl(dev, rrpc->soffset, rrpc->nr_sects, > + rrpc_l2p_update, rrpc); > if (ret) { > pr_err("nvm: rrpc: could not read L2P table.\n"); > return -EINVAL; > @@ -1220,18 +1217,24 @@ static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin) > struct nvm_dev *dev = rrpc->dev; > struct nvmm_type *mt = dev->mt; > sector_t size = rrpc->nr_sects * dev->sec_size; > + int ret; > > size >>= 9; > > - return mt->get_area(dev, begin, size); > + ret = mt->get_area(dev, begin, size); > + if (!ret) > + *begin >>= (ilog2(dev->sec_size) - 9); > + > + return ret; > } > > static void rrpc_area_free(struct rrpc *rrpc) > { > struct nvm_dev *dev = rrpc->dev; > struct nvmm_type *mt = dev->mt; > + sector_t begin = rrpc->soffset << (ilog2(dev->sec_size) - 9); > > - mt->put_area(dev, rrpc->soffset); > + mt->put_area(dev, begin); > } > > static void rrpc_free(struct rrpc *rrpc) > Thanks. Applied for 4.7. -- 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 c0e303c..3143b98 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -1039,11 +1039,8 @@ static int rrpc_map_init(struct rrpc *rrpc) { struct nvm_dev *dev = rrpc->dev; sector_t i; - u64 slba; int ret; - slba = rrpc->soffset >> (ilog2(dev->sec_size) - 9); - rrpc->trans_map = vzalloc(sizeof(struct rrpc_addr) * rrpc->nr_sects); if (!rrpc->trans_map) return -ENOMEM; @@ -1065,8 +1062,8 @@ static int rrpc_map_init(struct rrpc *rrpc) return 0; /* Bring up the mapping table from device */ - ret = dev->ops->get_l2p_tbl(dev, slba, rrpc->nr_sects, rrpc_l2p_update, - rrpc); + ret = dev->ops->get_l2p_tbl(dev, rrpc->soffset, rrpc->nr_sects, + rrpc_l2p_update, rrpc); if (ret) { pr_err("nvm: rrpc: could not read L2P table.\n"); return -EINVAL; @@ -1220,18 +1217,24 @@ static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin) struct nvm_dev *dev = rrpc->dev; struct nvmm_type *mt = dev->mt; sector_t size = rrpc->nr_sects * dev->sec_size; + int ret; size >>= 9; - return mt->get_area(dev, begin, size); + ret = mt->get_area(dev, begin, size); + if (!ret) + *begin >>= (ilog2(dev->sec_size) - 9); + + return ret; } static void rrpc_area_free(struct rrpc *rrpc) { struct nvm_dev *dev = rrpc->dev; struct nvmm_type *mt = dev->mt; + sector_t begin = rrpc->soffset << (ilog2(dev->sec_size) - 9); - mt->put_area(dev, rrpc->soffset); + mt->put_area(dev, begin); } static void rrpc_free(struct rrpc *rrpc)
Since we mainly use soffset in device sector size, we store that value in rrpc->soffset to reduce doing "(ilog2(dev->sec_size) - 9)". Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> --- drivers/lightnvm/rrpc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)