Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[uclinux-h8/linux.git] / drivers / lightnvm / pblk-init.c

diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index f9a3e47..8b643d0 100644 (file)
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -130,7 +130,7 @@ static int pblk_l2p_recover(struct pblk *pblk, bool factory_init)
        struct pblk_line *line = NULL;
 
        if (factory_init) {
-               pblk_setup_uuid(pblk);
+               guid_gen(&pblk->instance_uuid);
        } else {
                line = pblk_recov_l2p(pblk);
                if (IS_ERR(line)) {
@@ -584,14 +584,12 @@ static void pblk_lines_free(struct pblk *pblk)
        struct pblk_line *line;
        int i;
 
-       spin_lock(&l_mg->free_lock);
        for (i = 0; i < l_mg->nr_lines; i++) {
                line = &pblk->lines[i];
 
                pblk_line_free(line);
                pblk_line_meta_free(l_mg, line);
        }
-       spin_unlock(&l_mg->free_lock);
 
        pblk_line_mg_free(pblk);