bcachefs: Fix another error path locking bug
authorKent Overstreet <kent.overstreet@gmail.com>
Sat, 4 Apr 2020 19:45:06 +0000 (15:45 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:38 +0000 (17:08 -0400)
btree_update_nodes_written() was leaking a btree node lock on failure to
get a journal reservation.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_update_interior.c

index d5bea4f8ea021c569762772b1f2cbe1c3a305413..8b31f4d63094d0cfb1d1464ce78fcf0af7189420 100644 (file)
@@ -725,7 +725,7 @@ again:
 
        bch2_journal_res_put(&c->journal, &res);
        bch2_journal_preres_put(&c->journal, &as->journal_preres);
-
+free_update:
        /* Do btree write after dropping journal res: */
        if (b) {
                /*
@@ -736,8 +736,9 @@ again:
                six_unlock_intent(&b->c.lock);
        }
 
-       btree_update_nodes_reachable(as, res.seq);
-free_update:
+       if (!ret)
+               btree_update_nodes_reachable(as, res.seq);
+
        __bch2_btree_update_free(as);
        /*
         * for flush_held_btree_writes() waiting on updates to flush or