diff options
| author | Bill Paul <wpaul@FreeBSD.org> | 1996-12-31 07:10:19 +0000 |
|---|---|---|
| committer | Bill Paul <wpaul@FreeBSD.org> | 1996-12-31 07:10:19 +0000 |
| commit | 1b4a7d506fa82aa9b477267e97ee0def4f155325 (patch) | |
| tree | d67e43924543c70a95e77a11db261a4977010ea0 /sys | |
| parent | 53f49427b05ec9c9b7d8df2aacc3d97c2f8616a9 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 5 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 4405179f07c6..0bffdb6bb0c2 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.37 1996/11/06 10:53:12 dfr Exp $ + * $Id: nfs_vnops.c,v 1.38 1996/12/13 21:29:07 wollman Exp $ */ /* @@ -1606,9 +1606,10 @@ nfs_rename(ap) /* * If the tvp exists and is in use, sillyrename it before doing the * rename of the new file over it. + * XXX Can't sillyrename a directory. */ 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; } diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 4405179f07c6..0bffdb6bb0c2 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.37 1996/11/06 10:53:12 dfr Exp $ + * $Id: nfs_vnops.c,v 1.38 1996/12/13 21:29:07 wollman Exp $ */ /* @@ -1606,9 +1606,10 @@ nfs_rename(ap) /* * If the tvp exists and is in use, sillyrename it before doing the * rename of the new file over it. + * XXX Can't sillyrename a directory. */ 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; } |