Fix #9612: Run fsck -z once during upgrade
(cherry picked from commit 7373049764f144b2ea7c891bd60760ab64b41160)
Fix #9612: Run fsck -z once during upgrade
(cherry picked from commit 7373049764f144b2ea7c891bd60760ab64b41160)