lightnvm: pblk: fix bad le64 assignations

Use the right types and conversions on le64 variables. Reported by
sparse.

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

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 7648186bd1b1d469bd245a7d0d0f716c83dbfa65..a654b34f6f86466deb90334ef46ad34458a40f36 100644 (file)
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -765,7 +765,7 @@ static int pblk_line_submit_smeta_io(struct pblk *pblk, struct pblk_line *line,
                rqd.ppa_list[i] = addr_to_gen_ppa(pblk, paddr, line->id);
 
                if (dir == WRITE) {
-                       u64 addr_empty = cpu_to_le64(ADDR_EMPTY);
+                       __le64 addr_empty = cpu_to_le64(ADDR_EMPTY);
 
                        meta_list[i].lba = lba_list[paddr] = addr_empty;
                }

diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c
index 1d289242ab92ac593a7f608b2bb7b85d40d8a682..9b4059b93855d702f956a3ec4e0a46fd849141a5 100644 (file)
--- a/drivers/lightnvm/pblk-gc.c
+++ b/drivers/lightnvm/pblk-gc.c
@@ -314,10 +314,13 @@ static struct pblk_line *pblk_gc_get_victim_line(struct pblk *pblk,
                                                 struct list_head *group_list)
 {
        struct pblk_line *line, *victim;
+       int line_vsc, victim_vsc;
 
        victim = list_first_entry(group_list, struct pblk_line, list);
        list_for_each_entry(line, group_list, list) {
-               if (*line->vsc < *victim->vsc)
+               line_vsc = le32_to_cpu(*line->vsc);
+               victim_vsc = le32_to_cpu(*victim->vsc);
+               if (line_vsc < victim_vsc)
                        victim = line;
        }
 

diff --git a/drivers/lightnvm/pblk-map.c b/drivers/lightnvm/pblk-map.c
index a9be03cd07a842f24bcd22f2bf9c63de3cc9e824..fddb924f6dde744b3b2836fbda645951e179666c 100644 (file)
--- a/drivers/lightnvm/pblk-map.c
+++ b/drivers/lightnvm/pblk-map.c
@@ -53,7 +53,7 @@ static void pblk_map_page_data(struct pblk *pblk, unsigned int sentry,
                        lba_list[paddr] = cpu_to_le64(w_ctx->lba);
                        line->nr_valid_lbas++;
                } else {
-                       u64 addr_empty = cpu_to_le64(ADDR_EMPTY);
+                       __le64 addr_empty = cpu_to_le64(ADDR_EMPTY);
 
                        lba_list[paddr] = meta_list[i].lba = addr_empty;
                        __pblk_map_invalidate(pblk, line, paddr);

diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
index abf36f5874779743fb83098ab917851ac8bf36fc..7e1c314f2766b19b25da8c1f9a61d9fbb02fe1d5 100644 (file)
--- a/drivers/lightnvm/pblk-recovery.c
+++ b/drivers/lightnvm/pblk-recovery.c
@@ -395,7 +395,7 @@ next_pad_rq:
 
                for (j = 0; j < pblk->min_write_pgs; j++, i++, w_ptr++) {
                        struct ppa_addr dev_ppa;
-                       u64 addr_empty = cpu_to_le64(ADDR_EMPTY);
+                       __le64 addr_empty = cpu_to_le64(ADDR_EMPTY);
 
                        dev_ppa = addr_to_gen_ppa(pblk, w_ptr, line->id);