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

Update bcachefs sources to b2f5acc670 bcachefs: fix assertion in journal read

Browse Source
This commit is contained in:
Kent Overstreet 2017-12-21 18:57:37 -05:00
parent 1cf4d51dc4
commit da37a5f204
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
14ce2a2031f3761a4b957aa2e5aac446ce18b87c b2f5acc6709a25f6134714d763e3f6ace1e2cc55

5
libbcachefs/journal.c
View File

@ -395,9 +395,10 @@ add:
i->devs.nr = 0; i->devs.nr = 0;
memcpy(&i->j, j, bytes); memcpy(&i->j, j, bytes);
found: found:
if (!fsck_err_on(bch2_dev_list_has_dev(i->devs, ca->dev_idx), if (!bch2_dev_list_has_dev(i->devs, ca->dev_idx))
c, "duplicate journal entries on same device"))
bch2_dev_list_add_dev(&i->devs, ca->dev_idx); bch2_dev_list_add_dev(&i->devs, ca->dev_idx);
else
fsck_err_on(1, c, "duplicate journal entries on same device");
ret = JOURNAL_ENTRY_ADD_OK; ret = JOURNAL_ENTRY_ADD_OK;
out: out:
fsck_err: fsck_err: