diff options
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/journal.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index 03838458..9c2d6237 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -14ce2a2031f3761a4b957aa2e5aac446ce18b87c +b2f5acc6709a25f6134714d763e3f6ace1e2cc55 diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c index b4e149ac..ceae6194 100644 --- a/libbcachefs/journal.c +++ b/libbcachefs/journal.c @@ -395,9 +395,10 @@ add: i->devs.nr = 0; memcpy(&i->j, j, bytes); found: - if (!fsck_err_on(bch2_dev_list_has_dev(i->devs, ca->dev_idx), - c, "duplicate journal entries on same device")) + if (!bch2_dev_list_has_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; out: fsck_err: |