From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Thu, 21 Mar 2019 21:04:50 +0000 (-0400)
Subject: bcachefs: Fix error handling in bch2_fs_recovery()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=082f0801e0c96a4dbea67998b63c29c18da2419f;p=linux.git

bcachefs: Fix error handling in bch2_fs_recovery()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index fdc64e199f8b0..9610b488fbdf1 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -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;