diff --git a/src/box/box.cc b/src/box/box.cc index 7439f62e68e72e26d6a334bfb9bd153672242cfc..f60948b35afd4475efc295fddf70a799b227522b 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -326,12 +326,14 @@ recovery_journal_write(struct journal *base, return 0; } -static inline void -recovery_journal_create(struct recovery_journal *journal, struct vclock *v) +static void +recovery_journal_create(struct vclock *v) { - journal_create(&journal->base, recovery_journal_write, NULL); - journal->vclock = v; - journal_set(&journal->base); + static struct recovery_journal journal; + + journal_create(&journal.base, recovery_journal_write, NULL); + journal.vclock = v; + journal_set(&journal.base); } static void @@ -2067,8 +2069,7 @@ bootstrap_from_master(struct replica *master) * Process final data (WALs). */ engine_begin_final_recovery_xc(); - struct recovery_journal journal; - recovery_journal_create(&journal, &replicaset.vclock); + recovery_journal_create(&replicaset.vclock); if (!replication_anon) { applier_resume_to_state(applier, APPLIER_JOINED, @@ -2232,8 +2233,7 @@ local_recovery(const struct tt_uuid *instance_uuid, memtx = (struct memtx_engine *)engine_by_name("memtx"); assert(memtx != NULL); - struct recovery_journal journal; - recovery_journal_create(&journal, &recovery->vclock); + recovery_journal_create(&recovery->vclock); /* * We explicitly request memtx to recover its