Module Name: src Committed By: hannken Date: Wed Nov 28 09:56:09 UTC 2018
Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c Log Message: Remove an early test for "source and target are equal" from zfs_rename() that broke BSD semantics. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.29 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.30 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.29 Wed Nov 28 09:55:06 2018 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Wed Nov 28 09:56:09 2018 @@ -4191,11 +4191,13 @@ zfs_rename(vnode_t *sdvp, vnode_t **svpp goto unlockout; } +#ifndef __NetBSD__ /* If source and target are the same file, there is nothing to do. */ if ((*svpp) == (*tvpp)) { error = 0; goto unlockout; } +#endif if (((*svpp)->v_type == VDIR && (*svpp)->v_mountedhere != NULL) || ((*tvpp) != NULL && (*tvpp)->v_type == VDIR &&