add patch move-more-common-code-into-journal_init_common