diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-11 22:22:59 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-11 22:25:12 -0400 |
| commit | f3976e3733e97a0e96f5fc6349d1e82b25116043 (patch) | |
| tree | 87ab725ba56735f2157e77dc6bc4bc1c910890b2 /libbcachefs/recovery.c | |
| parent | bcee0320dcb53adb3786330a00a101840f2939d0 (diff) | |
Update bcachefs sources to b0788c47d9 bcachefs: Fix check_version_upgrade()
Diffstat (limited to 'libbcachefs/recovery.c')
| -rw-r--r-- | libbcachefs/recovery.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c index cb2186a7..33a68a33 100644 --- a/libbcachefs/recovery.c +++ b/libbcachefs/recovery.c @@ -132,7 +132,7 @@ static int bch2_journal_replay(struct bch_fs *c) move_gap(keys->d, keys->nr, keys->size, keys->gap, keys->nr); keys->gap = keys->nr; - keys_sorted = kvmalloc_array(sizeof(*keys_sorted), keys->nr, GFP_KERNEL); + keys_sorted = kvmalloc_array(keys->nr, sizeof(*keys_sorted), GFP_KERNEL); if (!keys_sorted) return -BCH_ERR_ENOMEM_journal_replay; @@ -507,7 +507,7 @@ static struct recovery_pass_fn recovery_pass_fns[] = { static void check_version_upgrade(struct bch_fs *c) { - unsigned latest_compatible = bch2_version_compatible(c->sb.version); + unsigned latest_compatible = bch2_latest_compatible_version(c->sb.version); unsigned latest_version = bcachefs_metadata_version_current; unsigned old_version = c->sb.version_upgrade_complete ?: c->sb.version; unsigned new_version = 0; @@ -759,7 +759,7 @@ use_clean: } c->journal_replay_seq_start = last_seq; - c->journal_replay_seq_end = blacklist_seq - 1;; + c->journal_replay_seq_end = blacklist_seq - 1; if (c->opts.reconstruct_alloc) { c->sb.compat &= ~(1ULL << BCH_COMPAT_alloc_info); |