Merge "ext4: make sure the journal sb is written in ext4_clear_journal_err()"