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/conf | |
| 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/conf')
| -rw-r--r-- | sys/conf/files | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files index 0f0acf0..e85e31c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1914,7 +1914,6 @@ fs/nfsclient/nfs_clrpcops.c optional nfscl fs/nfsclient/nfs_clvnops.c optional nfscl fs/nfsclient/nfs_clnode.c optional nfscl fs/nfsclient/nfs_clvfsops.c optional nfscl -fs/nfsclient/nfs_cllock.c optional nfscl fs/nfsclient/nfs_clport.c optional nfscl fs/nfsclient/nfs_clbio.c optional nfscl fs/nfsclient/nfs_clnfsiod.c optional nfscl @@ -2680,6 +2679,7 @@ netsmb/smb_subr.c optional netsmb netsmb/smb_trantcp.c optional netsmb netsmb/smb_usr.c optional netsmb nfs/nfs_common.c optional nfsclient | nfsserver +nfs/nfs_lock.c optional nfsclient | nfscl nfsclient/bootp_subr.c optional bootp nfsclient nfsclient/krpc_subr.c optional bootp nfsclient nfsclient/nfs_bio.c optional nfsclient @@ -2690,7 +2690,6 @@ nfsclient/nfs_subs.c optional nfsclient nfsclient/nfs_nfsiod.c optional nfsclient nfsclient/nfs_vfsops.c optional nfsclient nfsclient/nfs_vnops.c optional nfsclient -nfsclient/nfs_lock.c optional nfsclient nfsserver/nfs_fha.c optional nfsserver nfsserver/nfs_serv.c optional nfsserver nfsserver/nfs_srvkrpc.c optional nfsserver |
