From owner-svn-src-all@freebsd.org Sat May 18 12:53:35 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 313E5158A1CD; Sat, 18 May 2019 12:53:35 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF27780F77; Sat, 18 May 2019 12:53:34 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from [172.16.56.45] (unknown [66.171.165.146]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 6C9A81BC50; Sat, 18 May 2019 12:53:33 +0000 (UTC) Subject: Re: svn commit: r347953 - head/cddl/contrib/opensolaris/cmd/zfs To: Alexey Dokuchaev Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201905181227.x4ICRMsG073717@repo.freebsd.org> <20190518123708.GA73234@FreeBSD.org> From: Allan Jude Message-ID: <289b3593-421b-44e9-4c0b-d128f8648dcf@freebsd.org> Date: Sat, 18 May 2019 04:53:35 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190518123708.GA73234@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: BF27780F77 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.95)[-0.952,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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, 18 May 2019 12:53:35 -0000 On 5/18/19 8:37 AM, Alexey Dokuchaev wrote: > On Sat, May 18, 2019 at 12:27:22PM +0000, Allan Jude wrote: >> New Revision: 347953 >> URL: https://svnweb.freebsd.org/changeset/base/347953 >> >> Log: >> MFV/ZoL: `zfs userspace` ignored all unresolved UIDs after the first >> >> zfsonlinux/zfs@88cfff182432e4d1c24c877f33b47ee6cf109eee >> >> zfs_main: fix `zfs userspace` squashing unresolved entries >> >> ... >> @@ -2368,10 +2369,12 @@ us_compare(const void *larg, const void *rarg, void *u >> if (rv64 != lv64) >> rc = (rv64 < lv64) ? 1 : -1; >> } else { >> - (void) nvlist_lookup_string(lnvl, propname, >> - &lvstr); >> - (void) nvlist_lookup_string(rnvl, propname, >> - &rvstr); >> + if ((nvlist_lookup_string(lnvl, propname, >> + &lvstr) == ENOENT) || >> + (nvlist_lookup_string(rnvl, propname, >> + &rvstr) == ENOENT)) { >> + goto compare_nums; >> + } > > Another thing not to like about ZoL: their completely bogus code style > and formatting practices (look at those "&rvstr) == ENOENT"). If they > are going to listen to us, can we at least try to convince them not to > break existing, much FreeBSD-like formatting? > > ./danfe > They have strict CI that enforces Solaris cstyle, as that is what the code base has always used. No commit is merged until it passes that, and many other tests. -- Allan Jude