alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to ea3414eed5 fixup! bcachefs: Improve diagnostics when journal entries are missing

Browse Source
This commit is contained in:
Kent Overstreet 2021-01-29 15:33:24 -05:00
parent 7740db24f7
commit 7eef5f46dd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
bee34d805cf75e57f9380e0ee91771b9d90b2b2d ea3414eed52e5d90c248453e84b2dcd91c960306

4
libbcachefs/journal_io.c
View File

@ -104,12 +104,14 @@ add:
if (dup->bad) { if (dup->bad) {
/* we'll replace @dup: */ /* we'll replace @dup: */
} else if (bad) { } else if (bad) {
i = dup;
goto found; goto found;
} else { } else {
fsck_err_on(bytes != vstruct_bytes(&dup->j) || fsck_err_on(bytes != vstruct_bytes(&dup->j) ||
memcmp(j, &dup->j, bytes), c, memcmp(j, &dup->j, bytes), c,
"found duplicate but non identical journal entries (seq %llu)", "found duplicate but non identical journal entries (seq %llu)",
le64_to_cpu(j->seq)); le64_to_cpu(j->seq));
i = dup;
goto found; goto found;
} }
} }
@ -133,7 +135,7 @@ add:
list_add(&i->list, where); list_add(&i->list, where);
found: found:
for (ptr = i->ptrs; ptr < i->ptrs + i->nr_ptrs; i++) { for (ptr = i->ptrs; ptr < i->ptrs + i->nr_ptrs; ptr++) {
if (ptr->dev == ca->dev_idx) { if (ptr->dev == ca->dev_idx) {
bch_err(c, "duplicate journal entry %llu on same device", bch_err(c, "duplicate journal entry %llu on same device",
le64_to_cpu(i->j.seq)); le64_to_cpu(i->j.seq));