This update pulls in dim@'s earlier fix for building with clang 12 as well as an additional fix for breakage caused by a recent OpenZFS change to remove avl_size. Sponsored by: Netflix