bcachefs: Fix error handling in bch2_fs_recovery()
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 21 Mar 2019 21:04:50 +0000 (17:04 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:18 +0000 (17:08 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/recovery.c

index fdc64e199f8b06a7138198a26c0a9811b25c089e..9610b488fbdf1c14b47e6783cb7420bdb3b29244 100644 (file)
@@ -271,11 +271,13 @@ int bch2_fs_recovery(struct bch_fs *c)
                        continue;
 
                err = "invalid btree root pointer";
+               ret = -1;
                if (r->error)
                        goto err;
 
                err = "error reading btree root";
-               if (bch2_btree_root_read(c, i, &r->key, r->level)) {
+               ret = bch2_btree_root_read(c, i, &r->key, r->level);
+               if (ret) {
                        if (i != BTREE_ID_ALLOC)
                                goto err;