Commit 1c6286f2 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Axboe

lightnvm: fix some error code in pblk-init.c

There were a bunch of places in pblk_lines_init() where we didn't set an
error code.  And in pblk_writer_init() we accidentally return 1 instead
of a correct error code, which would result in a Oops later.

Fixes: 11a5d6fdf919 ("lightnvm: physical block device (pblk) target")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2a79efd8
...@@ -543,7 +543,7 @@ static int pblk_lines_init(struct pblk *pblk) ...@@ -543,7 +543,7 @@ static int pblk_lines_init(struct pblk *pblk)
long nr_bad_blks, nr_meta_blks, nr_free_blks; long nr_bad_blks, nr_meta_blks, nr_free_blks;
int bb_distance; int bb_distance;
int i; int i;
int ret = 0; int ret;
lm->sec_per_line = geo->sec_per_blk * geo->nr_luns; lm->sec_per_line = geo->sec_per_blk * geo->nr_luns;
lm->blk_per_line = geo->nr_luns; lm->blk_per_line = geo->nr_luns;
...@@ -638,12 +638,16 @@ static int pblk_lines_init(struct pblk *pblk) ...@@ -638,12 +638,16 @@ static int pblk_lines_init(struct pblk *pblk)
} }
l_mg->bb_template = kzalloc(lm->sec_bitmap_len, GFP_KERNEL); l_mg->bb_template = kzalloc(lm->sec_bitmap_len, GFP_KERNEL);
if (!l_mg->bb_template) if (!l_mg->bb_template) {
ret = -ENOMEM;
goto fail_free_meta; goto fail_free_meta;
}
l_mg->bb_aux = kzalloc(lm->sec_bitmap_len, GFP_KERNEL); l_mg->bb_aux = kzalloc(lm->sec_bitmap_len, GFP_KERNEL);
if (!l_mg->bb_aux) if (!l_mg->bb_aux) {
ret = -ENOMEM;
goto fail_free_bb_template; goto fail_free_bb_template;
}
bb_distance = (geo->nr_luns) * geo->sec_per_pl; bb_distance = (geo->nr_luns) * geo->sec_per_pl;
for (i = 0; i < lm->sec_per_line; i += bb_distance) for (i = 0; i < lm->sec_per_line; i += bb_distance)
...@@ -667,8 +671,10 @@ static int pblk_lines_init(struct pblk *pblk) ...@@ -667,8 +671,10 @@ static int pblk_lines_init(struct pblk *pblk)
pblk->lines = kcalloc(l_mg->nr_lines, sizeof(struct pblk_line), pblk->lines = kcalloc(l_mg->nr_lines, sizeof(struct pblk_line),
GFP_KERNEL); GFP_KERNEL);
if (!pblk->lines) if (!pblk->lines) {
ret = -ENOMEM;
goto fail_free_bb_aux; goto fail_free_bb_aux;
}
nr_free_blks = 0; nr_free_blks = 0;
for (i = 0; i < l_mg->nr_lines; i++) { for (i = 0; i < l_mg->nr_lines; i++) {
...@@ -682,8 +688,10 @@ static int pblk_lines_init(struct pblk *pblk) ...@@ -682,8 +688,10 @@ static int pblk_lines_init(struct pblk *pblk)
spin_lock_init(&line->lock); spin_lock_init(&line->lock);
nr_bad_blks = pblk_bb_line(pblk, line); nr_bad_blks = pblk_bb_line(pblk, line);
if (nr_bad_blks < 0 || nr_bad_blks > lm->blk_per_line) if (nr_bad_blks < 0 || nr_bad_blks > lm->blk_per_line) {
ret = -EINVAL;
goto fail_free_lines; goto fail_free_lines;
}
line->blk_in_line = lm->blk_per_line - nr_bad_blks; line->blk_in_line = lm->blk_per_line - nr_bad_blks;
if (line->blk_in_line < lm->min_blk_line) { if (line->blk_in_line < lm->min_blk_line) {
...@@ -733,7 +741,7 @@ static int pblk_writer_init(struct pblk *pblk) ...@@ -733,7 +741,7 @@ static int pblk_writer_init(struct pblk *pblk)
pblk->writer_ts = kthread_create(pblk_write_ts, pblk, "pblk-writer-t"); pblk->writer_ts = kthread_create(pblk_write_ts, pblk, "pblk-writer-t");
if (IS_ERR(pblk->writer_ts)) { if (IS_ERR(pblk->writer_ts)) {
pr_err("pblk: could not allocate writer kthread\n"); pr_err("pblk: could not allocate writer kthread\n");
return 1; return PTR_ERR(pblk->writer_ts);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment