bcachefs: Fix leakage of internal error code

Kent Overstreet · Kent Overstreet · commit c8296d730f19 · 2023-12-21T23:46:52.000-05:00
Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -408,8 +408,10 @@ static int journal_entry_btree_root_validate(struct bch_fs *c,`
`408`	`408`	`return 0;`
`409`	`409`	`}`
`410`	`410`
`411`		`- return journal_validate_key(c, jset, entry, 1, entry->btree_id, k,`
`412`		`- version, big_endian, flags);`
	`411`	`+ ret = journal_validate_key(c, jset, entry, 1, entry->btree_id, k,`
	`412`	`+ version, big_endian, flags);`
	`413`	`+ if (ret == FSCK_DELETED_KEY)`
	`414`	`+ ret = 0;`
`413`	`415`	`fsck_err:`
`414`	`416`	`return ret;`
`415`	`417`	`}`