diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2011-01-03 20:37:31 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2011-01-03 20:37:31 +0000 |
| commit | 53f27d6094f8d165bcafb24f7a049f6b3cf2a986 (patch) | |
| tree | 9aed4c3870731f851dbebcf0e78c72a3ef040397 /sys/nfs | |
| parent | 75e493953d739c141bef8a454eef4aedb9bf11d9 (diff) | |
| download | FreeBSD-src-53f27d6094f8d165bcafb24f7a049f6b3cf2a986.zip FreeBSD-src-53f27d6094f8d165bcafb24f7a049f6b3cf2a986.tar.gz | |
Fix the nlm so that it no longer depends on the regular
nfs client and, as such, can be loaded for the experimental
nfs client without the regular client.
Reviewed by: jhb
MFC after: 2 weeks
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_lock.c | 2 | ||||
| -rw-r--r-- | sys/nfs/nfs_mountcommon.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c index 4c220e2..0aca8e9 100644 --- a/sys/nfs/nfs_lock.c +++ b/sys/nfs/nfs_lock.c @@ -251,7 +251,7 @@ nfs_dolock(struct vop_advlock_args *ap) ASSERT_VOP_LOCKED(vp, "nfs_dolock"); nmp->nm_getinfo(vp, msg.lm_fh, &msg.lm_fh_len, &msg.lm_addr, - &msg.lm_nfsv3, NULL); + &msg.lm_nfsv3, NULL, NULL); VOP_UNLOCK(vp, 0); /* diff --git a/sys/nfs/nfs_mountcommon.h b/sys/nfs/nfs_mountcommon.h index c004b9c..2d0269a 100644 --- a/sys/nfs/nfs_mountcommon.h +++ b/sys/nfs/nfs_mountcommon.h @@ -35,7 +35,9 @@ * a mechanism for getting the client specific info for an nfs vnode. */ typedef void nfs_getinfofromvp_ftype(struct vnode *, uint8_t *, size_t *, - struct sockaddr_storage *, int *, off_t *); + struct sockaddr_storage *, int *, off_t *, + struct timeval *); +typedef int nfs_vinvalbuf_ftype(struct vnode *, int, struct thread *, int); struct nfsmount_common { struct mtx nmcom_mtx; @@ -46,6 +48,7 @@ struct nfsmount_common { int nmcom_retry; /* Max retries */ char nmcom_hostname[MNAMELEN]; /* server's name */ nfs_getinfofromvp_ftype *nmcom_getinfo; /* Get info from nfsnode */ + nfs_vinvalbuf_ftype *nmcom_vinvalbuf; /* Invalidate buffers */ }; #endif /* _NFS_MOUNTCOMMON_H_ */ |
