From afea74655f1d61cb0ebb8184118c0838e03e8c96 Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Wed, 27 Apr 2011 20:42:30 +0000 Subject: Fix module names and dependencies so the NFS clients will load correctly as modules after r221124. --- sys/fs/nfsclient/nfs_clvfsops.c | 6 +++++- sys/nfsclient/nfs_vfsops.c | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 476753dcf8fd..9f4ba72da60c 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -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 diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index cd33b04e2f5f..ec60c94cb236 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -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, -- cgit v1.2.3