lightnvm: make geometry structures 2.0 ready

Prepare for the 2.0 revision by adapting the geometry
structures to coexist with the 1.2 revision.

Signed-off-by: Matias Bjørling <m@bjorling.me>
Reviewed-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 76516ee84e9a..0849046b2a7a 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -979,7 +979,7 @@ static int pblk_line_init_metadata(struct pblk *pblk, struct pblk_line *line,
 
         /* Start metadata */
         smeta_buf->seq_nr = cpu_to_le64(line->seq_nr);
-        smeta_buf->window_wr_lun = cpu_to_le32(geo->nr_luns);
+        smeta_buf->window_wr_lun = cpu_to_le32(geo->all_luns);
 
         /* Fill metadata among lines */
         if (cur) {
@@ -1032,7 +1032,7 @@ static int pblk_line_init_bb(struct pblk *pblk, struct pblk_line *line,
                                                         lm->sec_per_line);
                 bitmap_or(line->map_bitmap, line->map_bitmap, l_mg->bb_aux,
                                                         lm->sec_per_line);
-                line->sec_in_line -= geo->sec_per_blk;
+                line->sec_in_line -= geo->sec_per_chk;
                 if (bit >= lm->emeta_bb)
                         nr_bb++;
         }
@@ -1746,7 +1746,7 @@ void pblk_up_rq(struct pblk *pblk, struct ppa_addr *ppa_list, int nr_ppas,
         struct nvm_tgt_dev *dev = pblk->dev;
         struct nvm_geo *geo = &dev->geo;
         struct pblk_lun *rlun;
-        int nr_luns = geo->nr_luns;
+        int nr_luns = geo->all_luns;
         int bit = -1;
 
         while ((bit = find_next_bit(lun_bitmap, nr_luns, bit + 1)) < nr_luns) {