From owner-svn-src-all@freebsd.org Sat May 18 12:37:09 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 3A00C15B1999; Sat, 18 May 2019 12:37:09 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D1E6677FD0; Sat, 18 May 2019 12:37:08 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id C32BE7C46; Sat, 18 May 2019 12:37:08 +0000 (UTC) Date: Sat, 18 May 2019 12:37:08 +0000 From: Alexey Dokuchaev To: Allan Jude Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r347953 - head/cddl/contrib/opensolaris/cmd/zfs Message-ID: <20190518123708.GA73234@FreeBSD.org> References: <201905181227.x4ICRMsG073717@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201905181227.x4ICRMsG073717@repo.freebsd.org> User-Agent: Mutt/1.11.4 (2019-03-13) X-Rspamd-Queue-Id: D1E6677FD0 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.86 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.86)[-0.864,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] 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:37:09 -0000 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