diff options
| author | Javier González <jg@lightnvm.io> | 2017-04-22 01:32:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-23 16:57:52 -0600 |
| commit | be388d9fbd4e09582e31c3ee82a022e368208ae3 (patch) | |
| tree | 7cd48c6139b78fb22d9a27cc4d49a4aa6af0e34b | |
| parent | 33db9fd46ea8e3e6d4757d99a3f97bd1a0c919f3 (diff) | |
lightnvm: pblk: free metadata on line alloc failure
When a line allocation fails, for example, due to having too many bad
blocks, free its metadata correctly.
Fixes: a4bd217b4326 "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>
| -rw-r--r-- | drivers/lightnvm/pblk-core.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 7eb62ec6c583..ac3742b85f2e 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -1127,6 +1127,7 @@ 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; } @@ -1134,18 +1135,17 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk, 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); @@ -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) |