From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 22 Dec 2023 04:17:00 +0000 (-0500)
Subject: bcachefs: Fix leakage of internal error code
X-Git-Tag: v6.7-rc8~12^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c8296d730f19b3916c11aa7b8c47a2b3e5a7ca9c;p=linux-block.git

bcachefs: Fix leakage of internal error code

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

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index 5de1b68fb8af..3eb6c3f62a81 100644
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -408,8 +408,10 @@ static int journal_entry_btree_root_validate(struct bch_fs *c,
 		return 0;
 	}
 
-	return journal_validate_key(c, jset, entry, 1, entry->btree_id, k,
-				    version, big_endian, flags);
+	ret = journal_validate_key(c, jset, entry, 1, entry->btree_id, k,
+				   version, big_endian, flags);
+	if (ret == FSCK_DELETED_KEY)
+		ret = 0;
 fsck_err:
 	return ret;
 }