Change in vdsm[master]: lib: Revert and refine error handling in tmap()