svn commit: r221615 - in head: etc/rc.d sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Sun May  8 01:01:27 2011
New Revision: 221615
URL: http://svn.freebsd.org/changeset/base/221615

Log:
  Change the new NFS server so that it uses vfs.nfsd naming
  for its sysctls instead of vfs.newnfs. This separates the
  names from the ones used by the client.

Modified:
  head/etc/rc.d/nfsd
  head/sys/fs/nfsserver/nfs_nfsdkrpc.c
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/etc/rc.d/nfsd
==============================================================================
--- head/etc/rc.d/nfsd	Sun May  8 00:39:49 2011	(r221614)
+++ head/etc/rc.d/nfsd	Sun May  8 01:01:27 2011	(r221615)
@@ -33,13 +33,13 @@ nfsd_precmd()
 	else
 		rc_flags="${nfs_server_flags}"
 
-		# Load the modules now, so that the vfs.newnfs sysctl
+		# Load the modules now, so that the vfs.nfsd sysctl
 		# oids are available.
 		load_kld nfsd
 
 		if checkyesno nfs_reserved_port_only; then
 			echo 'NFS on reserved port only=YES'
-			sysctl vfs.newnfs.nfs_privport=1 > /dev/null
+			sysctl vfs.nfsd.nfs_privport=1 > /dev/null
 		fi
 
 		if checkyesno nfsv4_server_enable; then
@@ -52,7 +52,7 @@ nfsd_precmd()
 			fi
 		else
 			echo 'NFSv4 is disabled'
-			sysctl vfs.newnfs.server_max_nfsvers=3 > /dev/null
+			sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null
 		fi
 	fi
 

Modified: head/sys/fs/nfsserver/nfs_nfsdkrpc.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sun May  8 00:39:49 2011	(r221614)
+++ head/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sun May  8 01:01:27 2011	(r221615)
@@ -75,21 +75,21 @@ static int newnfs_nfsv3_procid[NFS_V3NPR
 };
 
 
-SYSCTL_DECL(_vfs_newnfs);
+SYSCTL_DECL(_vfs_nfsd);
 
 SVCPOOL		*nfsrvd_pool;
 
 static int	nfs_privport = 0;
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, nfs_privport, CTLFLAG_RW,
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, nfs_privport, CTLFLAG_RW,
     &nfs_privport, 0,
     "Only allow clients using a privileged port for NFSv2 and 3");
 
 static int	nfs_minvers = NFS_VER2;
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, server_min_nfsvers, CTLFLAG_RW,
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, server_min_nfsvers, CTLFLAG_RW,
     &nfs_minvers, 0, "The lowest version of NFS handled by the server");
 
 static int	nfs_maxvers = NFS_VER4;
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, server_max_nfsvers, CTLFLAG_RW,
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, server_max_nfsvers, CTLFLAG_RW,
     &nfs_maxvers, 0, "The highest version of NFS handled by the server");
 
 static int nfs_proc(struct nfsrv_descript *, u_int32_t, struct socket *,
@@ -475,7 +475,7 @@ nfsrvd_init(int terminating)
 
 	NFSD_UNLOCK();
 
-	nfsrvd_pool = svcpool_create("nfsd", SYSCTL_STATIC_CHILDREN(_vfs_newnfs));
+	nfsrvd_pool = svcpool_create("nfsd", SYSCTL_STATIC_CHILDREN(_vfs_nfsd));
 	nfsrvd_pool->sp_rcache = NULL;
 	nfsrvd_pool->sp_assign = NULL;
 	nfsrvd_pool->sp_done = NULL;

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Sun May  8 00:39:49 2011	(r221614)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Sun May  8 01:01:27 2011	(r221615)
@@ -76,16 +76,16 @@ static int nfs_commit_miss;
 extern int nfsrv_issuedelegs;
 extern int nfsrv_dolocallocks;
 
-SYSCTL_DECL(_vfs_newnfs);
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, mirrormnt, CTLFLAG_RW,
+SYSCTL_NODE(_vfs, OID_AUTO, nfsd, CTLFLAG_RW, 0, "New NFS server");
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, mirrormnt, CTLFLAG_RW,
     &nfsrv_enable_crossmntpt, 0, "Enable nfsd to cross mount points");
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, commit_blks, CTLFLAG_RW, &nfs_commit_blks,
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, commit_blks, CTLFLAG_RW, &nfs_commit_blks,
     0, "");
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss,
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss,
     0, "");
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, issue_delegations, CTLFLAG_RW,
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, issue_delegations, CTLFLAG_RW,
     &nfsrv_issuedelegs, 0, "Enable nfsd to issue delegations");
-SYSCTL_INT(_vfs_newnfs, OID_AUTO, enable_locallocks, CTLFLAG_RW,
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, enable_locallocks, CTLFLAG_RW,
     &nfsrv_dolocallocks, 0, "Enable nfsd to acquire local locks on files");
 
 #define	NUM_HEURISTIC		1017