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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
