Revert "Revert "Fix up cross-device rename checks in zfs_rename(). This adds a check""

This reverts commit 99cfe89eed68751d4c701805f5583aab0da950ec.