lightnvm: pblk: correct valid lba count calculation

During garbage collect, lbas being written can end up
being invalidated. Make sure that this is reflected in
the valid lba count.

Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/lightnvm/pblk-map.c b/drivers/lightnvm/pblk-map.c
index 3bc4c94f9cf2d73219c3e07e98e097483f4c52b7..6f3ecde2140f36e63ab55a1f7b41a2996c22adf5 100644 (file)
--- a/drivers/lightnvm/pblk-map.c
+++ b/drivers/lightnvm/pblk-map.c
@@ -45,6 +45,8 @@ static void pblk_map_page_data(struct pblk *pblk, unsigned int sentry,
        paddr = pblk_alloc_page(pblk, line, nr_secs);
 
        for (i = 0; i < nr_secs; i++, paddr++) {
+               __le64 addr_empty = cpu_to_le64(ADDR_EMPTY);
+
                /* ppa to be sent to the device */
                ppa_list[i] = addr_to_gen_ppa(pblk, paddr, line->id);
 
@@ -61,10 +63,9 @@ static void pblk_map_page_data(struct pblk *pblk, unsigned int sentry,
                        w_ctx->ppa = ppa_list[i];
                        meta_list[i].lba = cpu_to_le64(w_ctx->lba);
                        lba_list[paddr] = cpu_to_le64(w_ctx->lba);
-                       line->nr_valid_lbas++;
+                       if (lba_list[paddr] != addr_empty)
+                               line->nr_valid_lbas++;
                } else {
-                       __le64 addr_empty = cpu_to_le64(ADDR_EMPTY);
-
                        lba_list[paddr] = meta_list[i].lba = addr_empty;
                        __pblk_map_invalidate(pblk, line, paddr);
                }