Date: Tue, 21 Oct 2014 21:40:38 +0000 From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Mateusz Guzik <mjg@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r273400 - in head/sys: kern sys Message-ID: <50143173-0319-45C0-A00E-AD2AA303C65D@FreeBSD.org> In-Reply-To: <201410211902.s9LJ2RoA031960@svn.freebsd.org> References: <201410211902.s9LJ2RoA031960@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 21 Oct 2014, at 19:02 , Mateusz Guzik <mjg@FreeBSD.org> wrote: > Author: mjg > Date: Tue Oct 21 19:02:26 2014 > New Revision: 273400 > URL: https://svnweb.freebsd.org/changeset/base/273400 >=20 > Log: > Rename sysctl_lock and _unlock to sysctl_xlock and _xunlock. You are perfectly describing what you are doing, but I=92d also like to = understand the =93why?=94 >=20 > Modified: > head/sys/kern/kern_linker.c > head/sys/kern/kern_sysctl.c > head/sys/kern/vfs_init.c > head/sys/sys/sysctl.h >=20 > Modified: head/sys/kern/kern_linker.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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; >=20 > sx_xunlock(&kld_sx); > - sysctl_lock(); > + sysctl_xlock(); > for (oidp =3D start; oidp < stop; oidp++) > sysctl_register_oid(*oidp); > - sysctl_unlock(); > + sysctl_xunlock(); > sx_xlock(&kld_sx); > } >=20 > @@ -313,10 +313,10 @@ linker_file_unregister_sysctls(linker_fi > return; >=20 > sx_xunlock(&kld_sx); > - sysctl_lock(); > + sysctl_xlock(); > for (oidp =3D start; oidp < stop; oidp++) > sysctl_unregister_oid(*oidp); > - sysctl_unlock(); > + sysctl_xunlock(); > sx_xlock(&kld_sx); > } >=20 >=20 > Modified: head/sys/kern/kern_sysctl.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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) > { >=20 > SYSCTL_XLOCK(); > } >=20 > void > -sysctl_unlock(void) > +sysctl_xunlock(void) > { >=20 > SYSCTL_XUNLOCK(); >=20 > Modified: head/sys/kern/vfs_init.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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) =3D=3D 0) { > sysctl_unregister_oid(oidp); > @@ -300,7 +300,7 @@ vfs_register(struct vfsconf *vfc) > break; > } > } > - sysctl_unlock(); > + sysctl_xunlock(); >=20 > return (0); > } >=20 > Modified: head/sys/sys/sysctl.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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); >=20 > struct sbuf; >=20 =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50143173-0319-45C0-A00E-AD2AA303C65D>