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,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
