diff options
author | rmacklem <rmacklem@FreeBSD.org> | 2010-07-24 22:11:11 +0000 |
---|---|---|
committer | rmacklem <rmacklem@FreeBSD.org> | 2010-07-24 22:11:11 +0000 |
commit | c7c4e3ebae85ae531fe298149a6ce0b2a0643a04 (patch) | |
tree | 4eec6454349918ebb035552eba42b0ef1fd7eaa6 /sys/nfsclient/nfs_nfsiod.c | |
parent | 0dd9a760b4e6c729904b4821a46073d2840a105c (diff) | |
download | FreeBSD-src-c7c4e3ebae85ae531fe298149a6ce0b2a0643a04.zip FreeBSD-src-c7c4e3ebae85ae531fe298149a6ce0b2a0643a04.tar.gz |
Move sys/nfsclient/nfs_lock.c into sys/nfs and build it as a separate
module that can be used by both the regular and experimental nfs
clients. This fixes the problem reported by jh@ where /dev/nfslock
would be registered twice when both nfs clients were used.
I also defined the size of the lm_fh field to be the correct value,
as it should be the maximum size of an NFSv3 file handle.
Reviewed by: jh
MFC after: 2 weeks
Diffstat (limited to 'sys/nfsclient/nfs_nfsiod.c')
-rw-r--r-- | sys/nfsclient/nfs_nfsiod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c index 5302c56..d192848 100644 --- a/sys/nfsclient/nfs_nfsiod.c +++ b/sys/nfsclient/nfs_nfsiod.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #include <nfsclient/nfsm_subs.h> #include <nfsclient/nfsmount.h> #include <nfsclient/nfsnode.h> -#include <nfsclient/nfs_lock.h> +#include <nfs/nfs_lock.h> static MALLOC_DEFINE(M_NFSSVC, "nfsclient_srvsock", "Nfs server structure"); |