summaryrefslogtreecommitdiff
path: root/libbcachefs/fsck.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-10-12 14:55:27 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2018-10-12 15:10:26 -0400
commit55fbb25501330038e1714905b9ddeb25d875c11c (patch)
treececfd15e26bfd60d95eea8a373e42337239e7c8c /libbcachefs/fsck.c
parent0268bec14bcf64b25b5dd75a470be8e85cbe676d (diff)
Update bcachefs sources to d7f6da1d60 bcachefs: fix missing include
Diffstat (limited to 'libbcachefs/fsck.c')
-rw-r--r--libbcachefs/fsck.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/libbcachefs/fsck.c b/libbcachefs/fsck.c
index 6d5fc17..e82e272 100644
--- a/libbcachefs/fsck.c
+++ b/libbcachefs/fsck.c
@@ -374,17 +374,15 @@ fsck_err:
kfree(d);
return ret;
err_redo:
- bch_err(c, "cannot fix dirent by removing trailing garbage %s (%zu)",
- buf, strlen(buf));
-
hash = bch2_dirent_hash_desc.hash_bkey(&h->info, *k);
- if (fsck_err(c, "hash table key at wrong offset: btree %u, offset %llu, "
- "hashed to %llu chain starts at %llu\n%s",
- BTREE_ID_DIRENTS,
- k->k->p.offset, hash, h->chain->pos.offset,
- (bch2_bkey_val_to_text(c, bkey_type(0, BTREE_ID_DIRENTS),
- buf, sizeof(buf), *k), buf))) {
+ if (fsck_err(c, "cannot fix dirent by removing trailing garbage %s (%zu)\n"
+ "hash table key at wrong offset: btree %u, offset %llu, "
+ "hashed to %llu chain starts at %llu\n%s",
+ buf, strlen(buf), BTREE_ID_DIRENTS,
+ k->k->p.offset, hash, h->chain->pos.offset,
+ (bch2_bkey_val_to_text(c, bkey_type(0, BTREE_ID_DIRENTS),
+ buf, sizeof(buf), *k), buf))) {
ret = hash_redo_key(bch2_dirent_hash_desc,
h, c, iter, *k, hash);
if (ret)