From owner-svn-src-all@freebsd.org Sat Jun 27 03:33:37 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 18F72340CAD for ; Sat, 27 Jun 2020 03:33:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49tzqh27fCz4FTg for ; Sat, 27 Jun 2020 03:33:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf33.google.com with SMTP id h18so5414117qvl.3 for ; Fri, 26 Jun 2020 20:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=OMLbPnVAc8FXumGoS23FVNS1el8pvTiKwacBy1NgcP4=; b=Ip2w5xqj3zkA0lx4YKiZWwwRwKkdjqTrL0PizCyb8wFkhLcCqlTPTCOtg+0cwIVmeW Ww/TQ5F8K5+IwHMWzeSE21RtzxOvUHYGv4K0MUDZBWo2dXpY3Ll8zLoJiSBZfbQWJKk0 tJ2nf60nHLuOO5yNCreBgfryT0uYO4L9jt9kSbGKR+JA0f8nrJ35e0oiGBWPibPqcrvm 0Mh6RG6Ubhsb0RxvvDVelUH/v4FLSGEH462htpKyZyEORi5sz/PMpSCqoW5RNmrARC/T 0C3eaYDKEv6U5GPU+0HtV3C3BoucfJjWNnZzJ2zGX5Jx+5J0ntRLEmXro0VdhVNchDYO 0Q8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OMLbPnVAc8FXumGoS23FVNS1el8pvTiKwacBy1NgcP4=; b=a2Mx54fmEZLgl6cMr9drvyBjJCM2G4f5FmuepNtt8+4wHdOz09RT1N3paLEP7sd9lp pozIG3DQrgcMca8UDFhJk7amjMq16psTn8FJTrXF2sfzgsTo1pbLn9suc/gJkUPWWC5H 48deCqh2COfBfVYGe0dMF81HdmWnj5ofTB6Z6S+4hiuNBMBgpz6yvM4TXoLsoFh29pd0 G84VMvUrtxGIJwIrKjIV+WKd6tmbcgkC/B6xL7GBSbcRz+ra6OGFbz2uBvwALYAEGLip jSvorw4ikjHLIkbfblW+LyfS2NmrkqdzNZ3gvTs3JozBX7YT2mQ/P3ILwE4qXIyLa8i8 QZnw== X-Gm-Message-State: AOAM530wgC7vaKYIWpbUR9gk07CyVpV3mGFyHOFnl3RKI+3rAc3kR5BY oefw2+ZqRsU//TgeFQHtTeu80A9pcsBMzloqoe9sEQ== X-Google-Smtp-Source: ABdhPJyJiGgP7xNBpVxd9wQRFbGG+gHqR2Lk1e555Zd4FJErXOCtHHTD5mEDJnkkE4shwMVtbEygQ/x6LRRppCD7EDY= X-Received: by 2002:a0c:e008:: with SMTP id j8mr2674193qvk.87.1593228815179; Fri, 26 Jun 2020 20:33:35 -0700 (PDT) MIME-Version: 1.0 References: <202006270057.05R0vmgC070914@repo.freebsd.org> <20200627010206.GA63841@FreeBSD.org> <94C5CFE0-2F25-44FA-B0B7-D6397D4EAC7A@gmail.com> In-Reply-To: <94C5CFE0-2F25-44FA-B0B7-D6397D4EAC7A@gmail.com> From: Warner Losh Date: Fri, 26 Jun 2020 21:33:23 -0600 Message-ID: Subject: Re: svn commit: r362667 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace To: Enji Cooper Cc: Alexey Dokuchaev , Matt Macy , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 49tzqh27fCz4FTg X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Ip2w5xqj; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f33) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.62 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.83)[-0.832]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.18)[0.178]; NEURAL_HAM_LONG(-0.96)[-0.961]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f33:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 03:33:37 -0000 On Fri, Jun 26, 2020, 9:04 PM Enji Cooper wrote: > > > On Jun 26, 2020, at 6:02 PM, Alexey Dokuchaev 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=E2=80=A6 > > > 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 >