lightnvm: fix lun offset calculation for mark blk

The gen_mark_blk_bad function marks the wrong block when a block is on
a different channel. Fix the index calculation, so that it updates the
correct block.

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

diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index c65fb675e37431bb98e484e75ad7719a240c7776..b74174c6d021b02a0bf311b2b4d83c1e6843bf40 100644 (file)
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -542,7 +542,7 @@ static void gen_mark_blk(struct nvm_dev *dev, struct ppa_addr ppa, int type)
                return;
        }
 
-       lun = &gn->luns[ppa.g.lun * ppa.g.ch];
+       lun = &gn->luns[(dev->luns_per_chnl * ppa.g.ch) + ppa.g.lun];
        blk = &lun->vlun.blocks[ppa.g.blk];
 
        /* will be moved to bb list on put_blk from target */