From owner-cvs-src-old@FreeBSD.ORG Sat Aug 7 01:10:20 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89F521065675 for ; Sat, 7 Aug 2010 01:10:20 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A2618FC16 for ; Sat, 7 Aug 2010 01:10:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o771AKMC094551 for ; Sat, 7 Aug 2010 01:10:20 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o771AK9f094550 for cvs-src-old@freebsd.org; Sat, 7 Aug 2010 01:10:20 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201008070110.o771AK9f094550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Sat, 7 Aug 2010 01:05:02 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sys/conf files src/sys/fs/nfsclient nfs_cllock.c nfs_clnfsiod.c nfs_clport.c nfs_clsubs.c nfs_clvnops.c nfs_lock.h src/sys/modules Makefile src/sys/modules/nfscl Makefile src/sys/modules/nfsclient Makefile src/sys/modules/nfslock ... X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2010 01:10:20 -0000 rmacklem 2010-08-07 01:05:02 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sys/conf files sys/fs/nfsclient nfs_clnfsiod.c nfs_clport.c nfs_clsubs.c nfs_clvnops.c sys/modules Makefile sys/modules/nfscl Makefile sys/modules/nfsclient Makefile sys/nfsclient nfs_nfsiod.c nfs_vfsops.c nfs_vnops.c usr.sbin/rpc.lockd kern.c Added files: (Branch: RELENG_8) sys/modules/nfslock Makefile sys/nfs nfs_lock.c nfs_lock.h Removed files: (Branch: RELENG_8) sys/fs/nfsclient nfs_cllock.c nfs_lock.h sys/nfsclient nfs_lock.c nfs_lock.h Log: SVN rev 210985 on 2010-08-07 01:05:02Z by rmacklem 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. Revision Changes Path 1.1459.2.34 +1 -2 src/sys/conf/files 1.1.2.2 +0 -396 src/sys/fs/nfsclient/nfs_cllock.c (dead) 1.1.2.4 +0 -1 src/sys/fs/nfsclient/nfs_clnfsiod.c 1.5.2.8 +1 -0 src/sys/fs/nfsclient/nfs_clport.c 1.1.2.9 +0 -1 src/sys/fs/nfsclient/nfs_clsubs.c 1.13.2.10 +3 -3 src/sys/fs/nfsclient/nfs_clvnops.c 1.1.2.2 +0 -89 src/sys/fs/nfsclient/nfs_lock.h (dead) 1.623.2.18 +1 -0 src/sys/modules/Makefile 1.1.2.2 +0 -1 src/sys/modules/nfscl/Makefile 1.39.2.3 +1 -1 src/sys/modules/nfsclient/Makefile 1.1.2.2 +9 -0 src/sys/modules/nfslock/Makefile (new) 1.15.2.2 +396 -0 src/sys/nfs/nfs_lock.c (new) 1.3.2.2 +90 -0 src/sys/nfs/nfs_lock.h (new) 1.51.2.2 +0 -396 src/sys/nfsclient/nfs_lock.c (dead) 1.6.22.2 +0 -92 src/sys/nfsclient/nfs_lock.h (dead) 1.95.2.3 +1 -1 src/sys/nfsclient/nfs_nfsiod.c 1.226.2.8 +1 -0 src/sys/nfsclient/nfs_vfsops.c 1.318.2.13 +1 -1 src/sys/nfsclient/nfs_vnops.c 1.22.2.2 +1 -1 src/usr.sbin/rpc.lockd/kern.c