From owner-cvs-src-old@FreeBSD.ORG Sat Jul 24 22:12:47 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 4BFE7106564A for ; Sat, 24 Jul 2010 22:12:47 +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 468F88FC15 for ; Sat, 24 Jul 2010 22:12:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6OMCl1j039340 for ; Sat, 24 Jul 2010 22:12:47 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6OMCk14039339 for cvs-src-old@freebsd.org; Sat, 24 Jul 2010 22:12:46 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201007242212.o6OMCk14039339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Sat, 24 Jul 2010 22:11:11 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD 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, 24 Jul 2010 22:12:47 -0000 rmacklem 2010-07-24 22:11:11 UTC FreeBSD src repository Modified files: 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 Added files: sys/modules/nfslock Makefile sys/nfs nfs_lock.c nfs_lock.h Removed files: sys/fs/nfsclient nfs_cllock.c nfs_lock.h sys/nfsclient nfs_lock.c nfs_lock.h Log: SVN rev 210455 on 2010-07-24 22:11:11Z by rmacklem 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 Revision Changes Path 1.1525 +1 -2 src/sys/conf/files 1.2 +0 -396 src/sys/fs/nfsclient/nfs_cllock.c (dead) 1.4 +0 -1 src/sys/fs/nfsclient/nfs_clnfsiod.c 1.12 +1 -0 src/sys/fs/nfsclient/nfs_clport.c 1.9 +0 -1 src/sys/fs/nfsclient/nfs_clsubs.c 1.24 +3 -3 src/sys/fs/nfsclient/nfs_clvnops.c 1.2 +0 -89 src/sys/fs/nfsclient/nfs_lock.h (dead) 1.658 +1 -0 src/sys/modules/Makefile 1.2 +0 -1 src/sys/modules/nfscl/Makefile 1.43 +1 -1 src/sys/modules/nfsclient/Makefile 1.1 +9 -0 src/sys/modules/nfslock/Makefile (new) 1.15 +396 -0 src/sys/nfs/nfs_lock.c (new) 1.3 +90 -0 src/sys/nfs/nfs_lock.h (new) 1.52 +0 -396 src/sys/nfsclient/nfs_lock.c (dead) 1.7 +0 -92 src/sys/nfsclient/nfs_lock.h (dead) 1.97 +1 -1 src/sys/nfsclient/nfs_nfsiod.c 1.235 +1 -0 src/sys/nfsclient/nfs_vfsops.c 1.331 +1 -1 src/sys/nfsclient/nfs_vnops.c