Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03e868eb authored by Hans Holmberg's avatar Hans Holmberg Committed by Jens Axboe
Browse files

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: default avatarHans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d6b992f7

drivers/lightnvm/pblk-map.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

			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);

		}