svn commit: r362667 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace

[Warner Losh]

On Fri, Jun 26, 2020, 9:04 PM Enji Cooper <yaneurabeya at gmail.com> wrote:

>
> > On Jun 26, 2020, at 6:02 PM, Alexey Dokuchaev <danfe at FreeBSD.org> wrote:
> >
> > On Sat, Jun 27, 2020 at 12:57:48AM +0000, Matt Macy wrote:
> >> New Revision: 362667
> >> URL: https://svnweb.freebsd.org/changeset/base/362667
> >>
> >> Log:
> >>  Fix "current" variable name conflict with openzfs
> >>
> >>  The variable "current" is an alias for curthread
> >>  in openzfs. Rename all variable uses of current
> >>  in dtrace.c to curstate.
> >
> > Shouldn't OpenZFS be fixed instead?  The fact that we need to fix our
> > local variables suggests that they're abusing too generic name…
>
>
>         I kind of agree with `current` being a bit too genericly named in
> both DTrace and OpenZFS :/..
>

It's always going to be something. These changes are actually pretty minor
and really only affect the part of the tree that uses Open Solaris
compatibility layer. These changes are smaller for us than changing all
OpenZFS. This really was the right fix.

Warner

>