Skip to content

Commit

Permalink
lightnvm: pblk: fix bad le64 assignations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Javier González authored and Jens Axboe committed Jun 30, 2017
1 parent a2b9377 commit f417aa0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/lightnvm/pblk-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 4 additions & 1 deletion drivers/lightnvm/pblk-gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/lightnvm/pblk-map.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/lightnvm/pblk-recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line,

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

Expand Down

0 comments on commit f417aa0

Please sign in to comment.