Moved the EXDEV handling into robust_rename().