lightnvm: unconverted ppa returned in get_bb_tbl

The get_bb_tbl function takes ppa as a generic address, which is
converted to the ppa device address within the device driver. When
the update_bbtbl callback is called from get_bb_tbl, the device
specific ppa is used, instead of the generic ppa.

Make sure to pass the generic ppa.

Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index 3969a9875e59..35dde84b71e9 100644
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -75,7 +75,6 @@ static int gennvm_block_bb(struct ppa_addr ppa, int nr_blocks, u8 *blks,
         struct nvm_block *blk;
         int i;
 
-        ppa = dev_to_generic_addr(gn->dev, ppa);
         lun = &gn->luns[(dev->nr_luns * ppa.g.ch) + ppa.g.lun];
 
         for (i = 0; i < nr_blocks; i++) {
@@ -187,7 +186,7 @@ static int gennvm_blocks_init(struct nvm_dev *dev, struct gen_nvm *gn)
                         ppa.g.lun = lun->vlun.id;
                         ppa = generic_to_dev_addr(dev, ppa);
 
-                        ret = dev->ops->get_bb_tbl(dev->q, ppa,
+                        ret = dev->ops->get_bb_tbl(dev, ppa,
                                                 dev->blks_per_lun,
                                                 gennvm_block_bb, gn);
                         if (ret)