summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-01-31 10:33:47 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-01-31 10:33:47 +0000
commit73c1328aece038c7e208458a3652b0687d036061 (patch)
treeafafc7c23538e486078f532bf35d27cac50a84d1 /sys
parent1d9758461cf0b62314cedb3cc91d8bd97f0e5042 (diff)
do not sillyrename directories; from freebsd
Diffstat (limited to 'sys')
-rw-r--r--sys/nfs/nfs_vnops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 1c2114df0e1..a657655ac38 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_vnops.c,v 1.12 1996/11/12 15:51:34 mickey Exp $ */
+/* $OpenBSD: nfs_vnops.c,v 1.13 1997/01/31 10:33:46 deraadt Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */
/*
@@ -1536,7 +1536,7 @@ nfs_rename(v)
* rename of the new file over it.
*/
if (tvp && tvp->v_usecount > 1 && !VTONFS(tvp)->n_sillyrename &&
- !nfs_sillyrename(tdvp, tvp, tcnp)) {
+ tvp->v_type != VDIR && !nfs_sillyrename(tdvp, tvp, tcnp)) {
vrele(tvp);
tvp = NULL;
}