From owner-svn-src-all@FreeBSD.ORG Wed Apr 27 20:42:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAF1B106566C; Wed, 27 Apr 2011 20:42:30 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AF2448FC12; Wed, 27 Apr 2011 20:42:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3RKgUKc089018; Wed, 27 Apr 2011 20:42:30 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3RKgUYv089014; Wed, 27 Apr 2011 20:42:30 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201104272042.p3RKgUYv089014@svn.freebsd.org> From: Rick Macklem Date: Wed, 27 Apr 2011 20:42:30 +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: r221139 - in head: etc/rc.d sys/fs/nfsclient sys/nfsclient X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2011 20:42:30 -0000 Author: rmacklem Date: Wed Apr 27 20:42:30 2011 New Revision: 221139 URL: http://svn.freebsd.org/changeset/base/221139 Log: Fix module names and dependencies so the NFS clients will load correctly as modules after r221124. Modified: head/etc/rc.d/nfsclient head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/nfsclient/nfs_vfsops.c Modified: head/etc/rc.d/nfsclient ============================================================================== --- head/etc/rc.d/nfsclient Wed Apr 27 20:08:44 2011 (r221138) +++ head/etc/rc.d/nfsclient Wed Apr 27 20:42:30 2011 (r221139) @@ -13,7 +13,7 @@ name="nfsclient" rcvar="nfs_client_enable" start_cmd="nfsclient_start" stop_cmd="unmount_all" -required_modules="nfsclient:nfs" +required_modules="nfsclient:oldnfs" nfsclient_start() { Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Wed Apr 27 20:08:44 2011 (r221138) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Wed Apr 27 20:42:30 2011 (r221139) @@ -134,7 +134,11 @@ static struct vfsops nfs_vfsops = { VFS_SET(nfs_vfsops, nfs, VFCF_NETWORK); /* So that loader and kldload(2) can find us, wherever we are.. */ -MODULE_VERSION(newnfs, 1); +MODULE_VERSION(nfs, 1); +MODULE_DEPEND(nfs, nfscommon, 1, 1, 1); +MODULE_DEPEND(nfs, krpc, 1, 1, 1); +MODULE_DEPEND(nfs, nfssvc, 1, 1, 1); +MODULE_DEPEND(nfs, nfslock, 1, 1, 1); /* * This structure is now defined in sys/nfs/nfs_diskless.c so that it Modified: head/sys/nfsclient/nfs_vfsops.c ============================================================================== --- head/sys/nfsclient/nfs_vfsops.c Wed Apr 27 20:08:44 2011 (r221138) +++ head/sys/nfsclient/nfs_vfsops.c Wed Apr 27 20:42:30 2011 (r221139) @@ -147,13 +147,13 @@ static struct vfsops nfs_vfsops = { VFS_SET(nfs_vfsops, oldnfs, VFCF_NETWORK); /* So that loader and kldload(2) can find us, wherever we are.. */ -MODULE_VERSION(nfs, 1); -MODULE_DEPEND(nfs, krpc, 1, 1, 1); +MODULE_VERSION(oldnfs, 1); +MODULE_DEPEND(oldnfs, krpc, 1, 1, 1); #ifdef KGSSAPI -MODULE_DEPEND(nfs, kgssapi, 1, 1, 1); +MODULE_DEPEND(oldnfs, kgssapi, 1, 1, 1); #endif -MODULE_DEPEND(nfs, nfs_common, 1, 1, 1); -MODULE_DEPEND(nfs, nfslock, 1, 1, 1); +MODULE_DEPEND(oldnfs, nfs_common, 1, 1, 1); +MODULE_DEPEND(oldnfs, nfslock, 1, 1, 1); static struct nfs_rpcops nfs_rpcops = { nfs_readrpc,