Update bcachefs sources to 3856459b1b bcachefs: bch2_btree_iter_peek_node_and_restart()

[bcachefs-tools-debian] / libbcachefs / super.c

diff --git a/libbcachefs/super.c b/libbcachefs/super.c
index 8bed11857bacfb824d98cffd3486d1e3ea75731b..359ca164e0889764d03cd930449debc89327b59a 100644 (file)
--- a/libbcachefs/super.c
+++ b/libbcachefs/super.c
@@ -488,7 +488,6 @@ static void __bch2_fs_free(struct bch_fs *c)
        kfree(rcu_dereference_protected(c->disk_groups, 1));
        kfree(c->journal_seq_blacklist_table);
        kfree(c->unused_inode_hints);
-       free_heap(&c->copygc_heap);
 
        if (c->io_complete_wq)
                destroy_workqueue(c->io_complete_wq);
@@ -707,7 +706,7 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts)
        INIT_LIST_HEAD(&c->data_progress_list);
        mutex_init(&c->data_progress_lock);
 
-       spin_lock_init(&c->ec_stripes_heap_lock);
+       mutex_init(&c->ec_stripes_heap_lock);
 
        seqcount_init(&c->gc_pos_lock);
 
@@ -1923,7 +1922,8 @@ out:
        kfree(sb);
        printbuf_exit(&errbuf);
        module_put(THIS_MODULE);
-       pr_verbose_init(opts, "ret %i", PTR_ERR_OR_ZERO(c));
+       pr_verbose_init(opts, "ret %s (%i)", bch2_err_str(PTR_ERR_OR_ZERO(c)),
+                       PTR_ERR_OR_ZERO(c));
        return c;
 err_print:
        pr_err("bch_fs_open err opening %s: %s",