]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
MFC: r210455, r210456
authorrmacklem <rmacklem@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 7 Aug 2010 01:05:02 +0000 (01:05 +0000)
committerrmacklem <rmacklem@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 7 Aug 2010 01:05:02 +0000 (01:05 +0000)
commit9d08d9c11860e4a56550101ac89df794f44bfc58
treec4123d2cbe7e8b2cf20586a2c4aea94fa479dea9
parent5865a753023997df5a1b7cf30782f7e7ac52dc54
MFC: r210455, r210456
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.
Also fix the include path for nfs_lock.h for usr.sbin/rpc.lockd/kern.c.

git-svn-id: svn://svn.freebsd.org/base/stable/8@210985 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
17 files changed:
sys/conf/files
sys/fs/nfsclient/nfs_cllock.c [deleted file]
sys/fs/nfsclient/nfs_clnfsiod.c
sys/fs/nfsclient/nfs_clport.c
sys/fs/nfsclient/nfs_clsubs.c
sys/fs/nfsclient/nfs_clvnops.c
sys/fs/nfsclient/nfs_lock.h [deleted file]
sys/modules/Makefile
sys/modules/nfscl/Makefile
sys/modules/nfsclient/Makefile
sys/modules/nfslock/Makefile [new file with mode: 0644]
sys/nfs/nfs_lock.c [moved from sys/nfsclient/nfs_lock.c with 99% similarity]
sys/nfs/nfs_lock.h [moved from sys/nfsclient/nfs_lock.h with 97% similarity]
sys/nfsclient/nfs_nfsiod.c
sys/nfsclient/nfs_vfsops.c
sys/nfsclient/nfs_vnops.c
usr.sbin/rpc.lockd/kern.c