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/modules | |
| 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/modules')
| -rw-r--r-- | sys/modules/Makefile | 1 | ||||
| -rw-r--r-- | sys/modules/nfscl/Makefile | 1 | ||||
| -rw-r--r-- | sys/modules/nfsclient/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/nfslock/Makefile | 9 |
4 files changed, 11 insertions, 2 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 191d629..d033a34 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -205,6 +205,7 @@ SUBDIR= ${_3dfx} \ nfsclient \ nfscommon \ nfsd \ + nfslock \ nfslockd \ nfsserver \ nfssvc \ diff --git a/sys/modules/nfscl/Makefile b/sys/modules/nfscl/Makefile index 66d5d93..7b95932 100644 --- a/sys/modules/nfscl/Makefile +++ b/sys/modules/nfscl/Makefile @@ -9,7 +9,6 @@ SRCS= vnode_if.h \ nfs_clcomsubs.c \ nfs_clport.c \ nfs_clbio.c \ - nfs_cllock.c \ nfs_clnfsiod.c \ nfs_clnode.c \ nfs_clsubs.c \ diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile index 5cd3556..0ce3d41 100644 --- a/sys/modules/nfsclient/Makefile +++ b/sys/modules/nfsclient/Makefile @@ -4,7 +4,7 @@ KMOD= nfsclient SRCS= vnode_if.h \ - nfs_bio.c nfs_lock.c nfs_node.c nfs_subs.c nfs_nfsiod.c \ + nfs_bio.c nfs_node.c nfs_subs.c nfs_nfsiod.c \ nfs_vfsops.c nfs_vnops.c nfs_krpc.c \ opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h SRCS+= opt_inet6.h opt_kdtrace.h opt_kgssapi.h diff --git a/sys/modules/nfslock/Makefile b/sys/modules/nfslock/Makefile new file mode 100644 index 0000000..0a1e208 --- /dev/null +++ b/sys/modules/nfslock/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../nfs +KMOD= nfslock +SRCS= vnode_if.h \ + nfs_lock.c \ + opt_nfs.h + +.include <bsd.kmod.mk> |
