From owner-cvs-src-old@FreeBSD.ORG Tue Oct 19 00:20:38 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 6D91C1065696 for ; Tue, 19 Oct 2010 00:20:38 +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 3CD4F8FC1C for ; Tue, 19 Oct 2010 00:20:38 +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 o9J0Kc14058946 for ; Tue, 19 Oct 2010 00:20:38 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o9J0KcjX058945 for cvs-src-old@freebsd.org; Tue, 19 Oct 2010 00:20:38 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201010190020.o9J0KcjX058945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Tue, 19 Oct 2010 00:20:00 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/fs/nfsclient nfs_clnode.c nfs_clvfsops.c nfs_clvnops.c nfsmount.h src/sys/nfs nfs_lock.c nfs_lock.h nfs_mountcommon.h src/sys/nfsclient nfs_node.c nfs_vfsops.c nfs_vnops.c nfsmount.h nfsnode.h src/sys/nlm nlm_advlock.c ... 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: Tue, 19 Oct 2010 00:20:38 -0000 rmacklem 2010-10-19 00:20:00 UTC FreeBSD src repository Modified files: sys/fs/nfsclient nfs_clnode.c nfs_clvfsops.c nfs_clvnops.c nfsmount.h sys/nfs nfs_lock.c nfs_lock.h sys/nfsclient nfs_node.c nfs_vfsops.c nfs_vnops.c nfsmount.h nfsnode.h sys/nlm nlm_advlock.c nlm_prot_impl.c Added files: sys/nfs nfs_mountcommon.h Log: SVN rev 214048 on 2010-10-19 00:20:00Z by rmacklem Modify the NFS clients and the NLM so that the NLM can be used by both clients. Since the NLM uses various fields of the nfsmount structure, those fields were extracted and put in a separate nfs_mountcommon structure stored in sys/nfs/nfs_mountcommon.h. This structure also has a function pointer for a function that extracts the required information from the mount point and nfs vnode for that particular client, for information stored differently by the clients. Reviewed by: jhb MFC after: 2 weeks Revision Changes Path 1.9 +5 -3 src/sys/fs/nfsclient/nfs_clnode.c 1.12 +40 -4 src/sys/fs/nfsclient/nfs_clvfsops.c 1.29 +2 -3 src/sys/fs/nfsclient/nfs_clvnops.c 1.4 +11 -6 src/sys/fs/nfsclient/nfsmount.h 1.16 +7 -5 src/sys/nfs/nfs_lock.c 1.4 +2 -0 src/sys/nfs/nfs_lock.h 1.1 +51 -0 src/sys/nfs/nfs_mountcommon.h (new) 1.96 +2 -0 src/sys/nfsclient/nfs_node.c 1.236 +27 -0 src/sys/nfsclient/nfs_vfsops.c 1.334 +0 -2 src/sys/nfsclient/nfs_vnops.c 1.40 +14 -7 src/sys/nfsclient/nfsmount.h 1.72 +0 -3 src/sys/nfsclient/nfsnode.h 1.10 +5 -10 src/sys/nlm/nlm_advlock.c 1.24 +2 -2 src/sys/nlm/nlm_prot_impl.c