ufs: be more persistent with finishing some operations
(cherry picked from commit 8d8589b385c901581ee71d09d86d044a6f42dfef)