Revert "do not unlink lockfiles (closes #703)"

This reverts commit 9ffe8907dd8be17501601c5af53c73fd0f25ee04.
make_lockfile: check ino and dev fields for lock file (refs #703)