Skip to content

Commit

Permalink
lightnvm: pblk: free metadata on line alloc failure
Browse files Browse the repository at this point in the history
When a line allocation fails, for example, due to having too many bad
blocks, free its metadata correctly.

Fixes: a4bd217 "lightnvm: physical block device (pblk) target"

Signed-off-by: Javier González <javier@cnexlabs.com>
Reviewed-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Javier González authored and Jens Axboe committed Apr 23, 2017
1 parent 33db9fd commit be388d9
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/lightnvm/pblk-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1127,25 +1127,25 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk,
spin_lock(&l_mg->free_lock);
retry_line = pblk_line_get(pblk);
if (!retry_line) {
l_mg->data_line = NULL;
spin_unlock(&l_mg->free_lock);
return NULL;
}

retry_line->smeta = line->smeta;
retry_line->emeta = line->emeta;
retry_line->meta_line = line->meta_line;
retry_line->map_bitmap = line->map_bitmap;
retry_line->invalid_bitmap = line->invalid_bitmap;

line->map_bitmap = NULL;
line->invalid_bitmap = NULL;
line->smeta = NULL;
line->emeta = NULL;
pblk_line_free(pblk, line);
l_mg->data_line = retry_line;
spin_unlock(&l_mg->free_lock);

if (pblk_line_erase(pblk, retry_line))
if (pblk_line_erase(pblk, retry_line)) {
spin_lock(&l_mg->free_lock);
l_mg->data_line = NULL;
spin_unlock(&l_mg->free_lock);
return NULL;
}

pblk_rl_free_lines_dec(&pblk->rl, retry_line);

Expand Down Expand Up @@ -1299,6 +1299,8 @@ void pblk_line_free(struct pblk *pblk, struct pblk_line *line)

line->map_bitmap = NULL;
line->invalid_bitmap = NULL;
line->smeta = NULL;
line->emeta = NULL;
}

void pblk_line_put(struct kref *ref)
Expand Down

0 comments on commit be388d9

Please sign in to comment.