diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1999-05-06 18:13:11 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1999-05-06 18:13:11 +0000 |
| commit | dfd5dee1b0cf927c9d59de8e423325603f86b500 (patch) | |
| tree | b8fae917f3fe139609bec4915b6cbc239974a255 /sys/nfs | |
| parent | 5f0d05904c70c58e07d4fd7fa4570840fbd9afda (diff) | |
Notes
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 5 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 63e8e39732adc..eef3d7fe09fa9 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95 - * $Id: nfs_serv.c,v 1.74 1999/04/27 11:17:49 phk Exp $ + * $Id: nfs_serv.c,v 1.75 1999/04/28 11:37:54 phk Exp $ */ /* @@ -1921,11 +1921,12 @@ nfsrv_rename(nfsd, slp, procp, mrq) error = ENOTEMPTY; goto out; } - if (fvp == tdvp) + if (fvp == tdvp) { if (v3) error = EINVAL; else error = ENOTEMPTY; + } /* * If source is the same as the destination (that is the * same vnode with the same name in the same directory), diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 13514b8ef9291..5170d214a6712 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.125 1999/05/02 23:56:26 alc Exp $ + * $Id: nfs_vnops.c,v 1.126 1999/05/03 20:59:14 alc Exp $ */ @@ -2543,11 +2543,12 @@ nfs_lookitup(dvp, name, len, cred, procp, npp) nfsm_reqdone; if (npp && *npp == NULL) { if (error) { - if (newvp) + if (newvp) { if (newvp == dvp) vrele(newvp); else vput(newvp); + } } else *npp = np; } |