svn commit: r273400 - in head/sys: kern sys

[Mateusz Guzik]

Author: mjg
Date: Tue Oct 21 19:02:26 2014
New Revision: 273400
URL: https://svnweb.freebsd.org/changeset/base/273400

Log:
  Rename sysctl_lock and _unlock to sysctl_xlock and _xunlock.

Modified:
  head/sys/kern/kern_linker.c
  head/sys/kern/kern_sysctl.c
  head/sys/kern/vfs_init.c
  head/sys/sys/sysctl.h

Modified: head/sys/kern/kern_linker.c
==============================================================================
--- head/sys/kern/kern_linker.c	Tue Oct 21 19:00:32 2014	(r273399)
+++ head/sys/kern/kern_linker.c	Tue Oct 21 19:02:26 2014	(r273400)
@@ -292,10 +292,10 @@ linker_file_register_sysctls(linker_file
 		return;
 
 	sx_xunlock(&kld_sx);
-	sysctl_lock();
+	sysctl_xlock();
 	for (oidp = start; oidp < stop; oidp++)
 		sysctl_register_oid(*oidp);
-	sysctl_unlock();
+	sysctl_xunlock();
 	sx_xlock(&kld_sx);
 }
 
@@ -313,10 +313,10 @@ linker_file_unregister_sysctls(linker_fi
 		return;
 
 	sx_xunlock(&kld_sx);
-	sysctl_lock();
+	sysctl_xlock();
 	for (oidp = start; oidp < stop; oidp++)
 		sysctl_unregister_oid(*oidp);
-	sysctl_unlock();
+	sysctl_xunlock();
 	sx_xlock(&kld_sx);
 }
 

Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c	Tue Oct 21 19:00:32 2014	(r273399)
+++ head/sys/kern/kern_sysctl.c	Tue Oct 21 19:02:26 2014	(r273400)
@@ -126,14 +126,14 @@ sysctl_find_oidname(const char *name, st
  * Order by number in each list.
  */
 void
-sysctl_lock(void)
+sysctl_xlock(void)
 {
 
 	SYSCTL_XLOCK();
 }
 
 void
-sysctl_unlock(void)
+sysctl_xunlock(void)
 {
 
 	SYSCTL_XUNLOCK();

Modified: head/sys/kern/vfs_init.c
==============================================================================
--- head/sys/kern/vfs_init.c	Tue Oct 21 19:00:32 2014	(r273399)
+++ head/sys/kern/vfs_init.c	Tue Oct 21 19:02:26 2014	(r273400)
@@ -291,7 +291,7 @@ vfs_register(struct vfsconf *vfc)
 	 * preserved by re-registering the oid after modifying its
 	 * number.
 	 */
-	sysctl_lock();
+	sysctl_xlock();
 	SLIST_FOREACH(oidp, SYSCTL_CHILDREN(&sysctl___vfs), oid_link) {
 		if (strcmp(oidp->oid_name, vfc->vfc_name) == 0) {
 			sysctl_unregister_oid(oidp);
@@ -300,7 +300,7 @@ vfs_register(struct vfsconf *vfc)
 			break;
 		}
 	}
-	sysctl_unlock();
+	sysctl_xunlock();
 
 	return (0);
 }

Modified: head/sys/sys/sysctl.h
==============================================================================
--- head/sys/sys/sysctl.h	Tue Oct 21 19:00:32 2014	(r273399)
+++ head/sys/sys/sysctl.h	Tue Oct 21 19:02:26 2014	(r273400)
@@ -770,8 +770,8 @@ int	userland_sysctl(struct thread *td, i
 	    size_t *retval, int flags);
 int	sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
 	    int *nindx, struct sysctl_req *req);
-void	sysctl_lock(void);
-void	sysctl_unlock(void);
+void	sysctl_xlock(void);
+void	sysctl_xunlock(void);
 int	sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
 
 struct sbuf;