summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-03-21 17:04:50 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2019-03-21 17:04:50 -0400
commitd5cb6fc38bec0af8f35922d0a6675da7ac6ff89c (patch)
treeb6fa4d65d7893e75d999b971a37a84118a1a9b26
parentcec68342cb27fc18668402dc4e637abeadf9f6cd (diff)
bcachefs: Fix error handling in bch2_fs_recovery()
-rw-r--r--fs/bcachefs/recovery.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 77ab464a8242..1dc15833154f 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -270,11 +270,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;