lightnvm: pblk: improve line helpers

The current helper to obtain a line from a ppa returns the line id,
which requires its users to explicitly retrieve the pointer to the line
with the id.

Make 2 different helpers: one returning the line id and one returning
the line directly.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
index df99c45778d4..c23b65aaa27b 100644
--- a/drivers/lightnvm/pblk-write.c
+++ b/drivers/lightnvm/pblk-write.c
@@ -113,7 +113,7 @@ static void pblk_map_remaining(struct pblk *pblk, struct ppa_addr *ppa)
         u64 paddr;
         int done = 0;
 
-        line = &pblk->lines[pblk_ppa_to_line(*ppa)];
+        line = pblk_ppa_to_line(pblk, *ppa);
         spin_lock(&line->lock);
 
         while (!done)  {
@@ -171,7 +171,7 @@ static void pblk_prepare_resubmit(struct pblk *pblk, unsigned int sentry,
                 /* Decrese the reference count to the line as we will
                  * re-map these entries
                  */
-                line = &pblk->lines[pblk_ppa_to_line(w_ctx->ppa)];
+                line = pblk_ppa_to_line(pblk, w_ctx->ppa);
                 kref_put(&line->ref, pblk_line_put);
 
                 pos = (pos + 1) & (rb->nr_entries - 1);