lightnvm: pblk: move ring buffer alloc/free rb init

pblk's read/write buffer currently takes a buffer and its size and uses
it to create the metadata around it to use it as a ring buffer. This
puts the responsibility of allocating/freeing ring buffer memory on the
ring buffer user. Instead, move it inside of the ring buffer helpers
(pblk-rb.c). This simplifies creation/destruction routines.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 3 insertions, 15 deletions

diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index f84c428a76f1..b2c49fc006c9 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -185,17 +185,14 @@ static void pblk_rwb_free(struct pblk *pblk)
         if (pblk_rb_tear_down_check(&pblk->rwb))
                 pblk_err(pblk, "write buffer error on tear down\n");
 
-        pblk_rb_data_free(&pblk->rwb);
-        vfree(pblk_rb_entries_ref(&pblk->rwb));
+        pblk_rb_free(&pblk->rwb);
 }
 
 static int pblk_rwb_init(struct pblk *pblk)
 {
         struct nvm_tgt_dev *dev = pblk->dev;
         struct nvm_geo *geo = &dev->geo;
-        struct pblk_rb_entry *entries;
-        unsigned long nr_entries, buffer_size;
-        unsigned int power_size, power_seg_sz;
+        unsigned long buffer_size;
         int pgs_in_buffer;
 
         pgs_in_buffer = max(geo->mw_cunits, geo->ws_opt) * geo->all_luns;
@@ -205,16 +202,7 @@ static int pblk_rwb_init(struct pblk *pblk)
         else
                 buffer_size = pgs_in_buffer;
 
-        nr_entries = pblk_rb_calculate_size(buffer_size);
-
-        entries = vzalloc(array_size(nr_entries, sizeof(struct pblk_rb_entry)));
-        if (!entries)
-                return -ENOMEM;
-
-        power_size = get_count_order(nr_entries);
-        power_seg_sz = get_count_order(geo->csecs);
-
-        return pblk_rb_init(&pblk->rwb, entries, power_size, power_seg_sz);
+        return pblk_rb_init(&pblk->rwb, buffer_size, geo->csecs);
 }
 
 /* Minimum pages needed within a lun */