Revert "Revert "Fix unlink/xattr deadlock""