diff options
| author | David Greenman <dg@FreeBSD.org> | 1995-07-13 08:48:48 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1995-07-13 08:48:48 +0000 |
| commit | 24a1cce34fc10ade769c2d2f2e00ca5ad820a671 (patch) | |
| tree | c6f2eefb41eadd82d51ecb0deced0d6d361765ee /sys/nfsclient | |
| parent | 33d23de425a671d60d42d6e7c1a0632c6e795fa7 (diff) | |
Notes
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_subs.c | 11 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index c47d20df8d2b..848c30bf4081 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.18 1995/06/28 12:01:05 davidg Exp $ + * $Id: nfs_subs.c,v 1.19 1995/07/09 06:57:59 davidg Exp $ */ /* @@ -59,6 +59,7 @@ #endif #include <vm/vm.h> +#include <vm/vnode_pager.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> @@ -72,8 +73,6 @@ #include <miscfs/specfs/specdev.h> -#include <vm/vnode_pager.h> - #include <netinet/in.h> #ifdef ISO #include <netiso/iso.h> @@ -1898,7 +1897,6 @@ nfsrv_errmap(nd, err) int nfsrv_vmio(struct vnode *vp) { vm_object_t object; - vm_pager_t pager; if ((vp == NULL) || (vp->v_type != VREG)) return 1; @@ -1923,10 +1921,7 @@ retry: } if (!object) panic("nfsrv_vmio: VMIO object missing"); - pager = object->pager; - if (!pager) - panic("nfsrv_vmio: VMIO pager missing"); - (void) vm_object_lookup(pager); + vm_object_reference(object); } return 0; } diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 59ba9b68e04a..f4872fdfe478 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.17 1995/06/28 07:06:52 davidg Exp $ + * $Id: nfs_vnops.c,v 1.18 1995/06/28 17:33:39 dfr Exp $ */ /* @@ -59,6 +59,7 @@ #include <ufs/ufs/dir.h> #include <vm/vm.h> +#include <vm/vnode_pager.h> #include <miscfs/specfs/specdev.h> #include <miscfs/fifofs/fifo.h> |