summaryrefslogtreecommitdiff
path: root/libbcachefs/recovery.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-07-10 20:31:34 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-07-15 17:36:15 -0400
commitc8bec83e307f28751c433ba1d3f648429fb5a34c (patch)
tree6e70e0cf8f25117f706214d86a0689ee8495dca0 /libbcachefs/recovery.c
parent1c156d5c4667c1c2e2949b229dfef75696196d35 (diff)
Update bcachefs sources to e14d7c7195 bcachefs: Compression levels
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/recovery.c')
-rw-r--r--libbcachefs/recovery.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c
index b04e1565..63b385d8 100644
--- a/libbcachefs/recovery.c
+++ b/libbcachefs/recovery.c
@@ -1162,12 +1162,9 @@ static void check_version_upgrade(struct bch_fs *c)
prt_str(&buf, " incomplete\n");
}
- prt_str(&buf, "Doing ");
- if (BCH_VERSION_MAJOR(old_version) != BCH_VERSION_MAJOR(new_version))
- prt_str(&buf, "incompatible");
- else
- prt_str(&buf, "compatible");
- prt_str(&buf, "version upgrade from ");
+ prt_printf(&buf, "Doing %s version upgrade from ",
+ BCH_VERSION_MAJOR(old_version) != BCH_VERSION_MAJOR(new_version)
+ ? "incompatible" : "compatible");
bch2_version_to_text(&buf, old_version);
prt_str(&buf, " to ");
bch2_version_to_text(&buf, new_version);
@@ -1178,7 +1175,7 @@ static void check_version_upgrade(struct bch_fs *c)
prt_str(&buf, "fsck required");
c->recovery_passes_explicit |= recovery_passes;
- c->opts.fix_errors = FSCK_OPT_YES;
+ c->opts.fix_errors = FSCK_FIX_yes;
}
bch_info(c, "%s", buf.buf);