diff options
| -rw-r--r-- | sys/nfs/nfs_common.c | 11 | ||||
| -rw-r--r-- | sys/nfs/nfs_subs.c | 11 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_subs.c | 11 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 11 |
4 files changed, 28 insertions, 16 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index f28136087602..7b2cf6441f61 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.7 1994/10/17 17:47:37 phk Exp $ + * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ */ /* @@ -1207,17 +1207,20 @@ retry: int nfsrv_vput( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vput( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vput( vp); } - vput( vp); return 0; } int nfsrv_vrele( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vrele( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vrele( vp); } - vrele( vp); return 0; } - diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index f28136087602..7b2cf6441f61 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.7 1994/10/17 17:47:37 phk Exp $ + * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ */ /* @@ -1207,17 +1207,20 @@ retry: int nfsrv_vput( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vput( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vput( vp); } - vput( vp); return 0; } int nfsrv_vrele( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vrele( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vrele( vp); } - vrele( vp); return 0; } - diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index f28136087602..7b2cf6441f61 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.7 1994/10/17 17:47:37 phk Exp $ + * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ */ /* @@ -1207,17 +1207,20 @@ retry: int nfsrv_vput( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vput( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vput( vp); } - vput( vp); return 0; } int nfsrv_vrele( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vrele( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vrele( vp); } - vrele( vp); return 0; } - diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index f28136087602..7b2cf6441f61 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.7 1994/10/17 17:47:37 phk Exp $ + * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ */ /* @@ -1207,17 +1207,20 @@ retry: int nfsrv_vput( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vput( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vput( vp); } - vput( vp); return 0; } int nfsrv_vrele( struct vnode *vp) { if( (vp->v_flag & VVMIO) && vp->v_vmdata) { + vrele( vp); vm_object_deallocate( (vm_object_t) vp->v_vmdata); + } else { + vrele( vp); } - vrele( vp); return 0; } - |