block: Improve stability of unmount