From owner-svn-src-head@FreeBSD.ORG Wed Jun 10 21:31:57 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 729E31065670; Wed, 10 Jun 2009 21:31:57 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6189E8FC08; Wed, 10 Jun 2009 21:31:57 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ALVvha026711; Wed, 10 Jun 2009 21:31:57 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ALVvDd026710; Wed, 10 Jun 2009 21:31:57 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200906102131.n5ALVvDd026710@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 10 Jun 2009 21:31:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193957 - head/sys/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 21:31:58 -0000 Author: bz Date: Wed Jun 10 21:31:57 2009 New Revision: 193957 URL: http://svn.freebsd.org/changeset/base/193957 Log: Unfortunately fs/nfsserver depends on INET at the moment. It seems to be nfs_nfsdport.c and nfs_nfsdcache.c are the problem only but we need to mark all or we will run into problems at link time. One is because of calling an INET specific function, the other is because of VIMAGE putting all tcp* into struct vnet_inet. Both are general problems throughout the entire stack and not a fault of the NFS implementation and will need to be addressed in the future. Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Jun 10 21:18:21 2009 (r193956) +++ head/sys/conf/files Wed Jun 10 21:31:57 2009 (r193957) @@ -1746,13 +1746,13 @@ 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 -fs/nfsserver/nfs_nfsdsocket.c optional nfsd -fs/nfsserver/nfs_nfsdsubs.c optional nfsd -fs/nfsserver/nfs_nfsdstate.c optional nfsd -fs/nfsserver/nfs_nfsdkrpc.c optional nfsd -fs/nfsserver/nfs_nfsdserv.c optional nfsd -fs/nfsserver/nfs_nfsdport.c optional nfsd -fs/nfsserver/nfs_nfsdcache.c optional nfsd +fs/nfsserver/nfs_nfsdsocket.c optional nfsd inet +fs/nfsserver/nfs_nfsdsubs.c optional nfsd inet +fs/nfsserver/nfs_nfsdstate.c optional nfsd inet +fs/nfsserver/nfs_nfsdkrpc.c optional nfsd inet +fs/nfsserver/nfs_nfsdserv.c optional nfsd inet +fs/nfsserver/nfs_nfsdport.c optional nfsd inet +fs/nfsserver/nfs_nfsdcache.c optional nfsd inet fs/ntfs/ntfs_compr.c optional ntfs fs/ntfs/ntfs_iconv.c optional ntfs_iconv fs/ntfs/ntfs_ihash.c optional ntfs