Rename sysctl_lock and _unlock to sysctl_xlock and _xunlock.
This commit is contained in:
parent
203a8409a0
commit
580a011762
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273400
@ -292,10 +292,10 @@ linker_file_register_sysctls(linker_file_t lf)
|
||||
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_file_t lf)
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -126,14 +126,14 @@ sysctl_find_oidname(const char *name, struct sysctl_oid_list *list)
|
||||
* Order by number in each list.
|
||||
*/
|
||||
void
|
||||
sysctl_lock(void)
|
||||
sysctl_xlock(void)
|
||||
{
|
||||
|
||||
SYSCTL_XLOCK();
|
||||
}
|
||||
|
||||
void
|
||||
sysctl_unlock(void)
|
||||
sysctl_xunlock(void)
|
||||
{
|
||||
|
||||
SYSCTL_XUNLOCK();
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -770,8 +770,8 @@ int userland_sysctl(struct thread *td, int *name, u_int namelen, void *old,
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user