From owner-cvs-src-old@FreeBSD.ORG Mon Nov 1 01:03:37 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 33E79106564A for ; Mon, 1 Nov 2010 01:03:37 +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 038668FC18 for ; Mon, 1 Nov 2010 01:03:37 +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 oA113aSH051989 for ; Mon, 1 Nov 2010 01:03:36 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oA113aed051988 for cvs-src-old@freebsd.org; Mon, 1 Nov 2010 01:03:36 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201011010103.oA113aed051988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Mon, 1 Nov 2010 01:03:05 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 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: Mon, 01 Nov 2010 01:03:37 -0000 rmacklem 2010-11-01 01:03:05 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) 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: (Branch: RELENG_8) sys/nfs nfs_mountcommon.h Log: SVN rev 214612 on 2010-11-01 01:03:05Z by rmacklem MFC: r214048, r214053 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. Also, fix the type of the 3rd argument for this function. Revision Changes Path 1.4.2.5 +5 -3 src/sys/fs/nfsclient/nfs_clnode.c 1.8.2.5 +40 -4 src/sys/fs/nfsclient/nfs_clvfsops.c 1.13.2.15 +2 -3 src/sys/fs/nfsclient/nfs_clvnops.c 1.1.2.4 +11 -6 src/sys/fs/nfsclient/nfsmount.h 1.15.2.3 +7 -5 src/sys/nfs/nfs_lock.c 1.3.2.3 +2 -0 src/sys/nfs/nfs_lock.h 1.2.2.2 +51 -0 src/sys/nfs/nfs_mountcommon.h (new) 1.92.2.4 +2 -0 src/sys/nfsclient/nfs_node.c 1.226.2.9 +27 -0 src/sys/nfsclient/nfs_vfsops.c 1.318.2.16 +0 -2 src/sys/nfsclient/nfs_vnops.c 1.38.2.3 +14 -7 src/sys/nfsclient/nfsmount.h 1.66.2.6 +0 -3 src/sys/nfsclient/nfsnode.h 1.9.2.2 +5 -10 src/sys/nlm/nlm_advlock.c 1.20.2.4 +2 -2 src/sys/nlm/nlm_prot_impl.c