aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/lightnvm/pblk-core.c6
-rw-r--r--drivers/lightnvm/pblk-init.c2
-rw-r--r--drivers/lightnvm/pblk.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 9a70cfe18934..26f3c14ad799 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -1337,7 +1337,7 @@ retry:
1337 retry_line->emeta = line->emeta; 1337 retry_line->emeta = line->emeta;
1338 retry_line->meta_line = line->meta_line; 1338 retry_line->meta_line = line->meta_line;
1339 1339
1340 pblk_line_free(pblk, line); 1340 pblk_line_free(line);
1341 l_mg->data_line = retry_line; 1341 l_mg->data_line = retry_line;
1342 spin_unlock(&l_mg->free_lock); 1342 spin_unlock(&l_mg->free_lock);
1343 1343
@@ -1562,7 +1562,7 @@ out:
1562 return new; 1562 return new;
1563} 1563}
1564 1564
1565void pblk_line_free(struct pblk *pblk, struct pblk_line *line) 1565void pblk_line_free(struct pblk_line *line)
1566{ 1566{
1567 kfree(line->map_bitmap); 1567 kfree(line->map_bitmap);
1568 kfree(line->invalid_bitmap); 1568 kfree(line->invalid_bitmap);
@@ -1584,7 +1584,7 @@ static void __pblk_line_put(struct pblk *pblk, struct pblk_line *line)
1584 WARN_ON(line->state != PBLK_LINESTATE_GC); 1584 WARN_ON(line->state != PBLK_LINESTATE_GC);
1585 line->state = PBLK_LINESTATE_FREE; 1585 line->state = PBLK_LINESTATE_FREE;
1586 line->gc_group = PBLK_LINEGC_NONE; 1586 line->gc_group = PBLK_LINEGC_NONE;
1587 pblk_line_free(pblk, line); 1587 pblk_line_free(line);
1588 spin_unlock(&line->lock); 1588 spin_unlock(&line->lock);
1589 1589
1590 atomic_dec(&gc->pipeline_gc); 1590 atomic_dec(&gc->pipeline_gc);
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index fe501e6d45fc..1e1771864da0 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -509,7 +509,7 @@ static void pblk_lines_free(struct pblk *pblk)
509 for (i = 0; i < l_mg->nr_lines; i++) { 509 for (i = 0; i < l_mg->nr_lines; i++) {
510 line = &pblk->lines[i]; 510 line = &pblk->lines[i];
511 511
512 pblk_line_free(pblk, line); 512 pblk_line_free(line);
513 pblk_line_meta_free(line); 513 pblk_line_meta_free(line);
514 } 514 }
515 spin_unlock(&l_mg->free_lock); 515 spin_unlock(&l_mg->free_lock);
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index feafa4de264d..97c0dd5f4857 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -766,7 +766,7 @@ struct pblk_line *pblk_line_get_data(struct pblk *pblk);
766struct pblk_line *pblk_line_get_erase(struct pblk *pblk); 766struct pblk_line *pblk_line_get_erase(struct pblk *pblk);
767int pblk_line_erase(struct pblk *pblk, struct pblk_line *line); 767int pblk_line_erase(struct pblk *pblk, struct pblk_line *line);
768int pblk_line_is_full(struct pblk_line *line); 768int pblk_line_is_full(struct pblk_line *line);
769void pblk_line_free(struct pblk *pblk, struct pblk_line *line); 769void pblk_line_free(struct pblk_line *line);
770void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line); 770void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line);
771void pblk_line_close(struct pblk *pblk, struct pblk_line *line); 771void pblk_line_close(struct pblk *pblk, struct pblk_line *line);
772void pblk_line_close_ws(struct work_struct *work); 772void pblk_line_close_ws(struct work_struct *work);