Starting on 5/20, OpenZFS encountered a behavior change in which one of the tests in the test suite began failing 100% of the time on the buildbot which runs 14-CURRENT snapshots, which was not improved by rolling back to earlier revisions of OpenZFS.
One kernel bisect later, ca1ce50b2b5ef11d85841f3aead98b2a9ad18819 is the winner; a few rounds of reverting individual hunks pointed to the one touched in this patch as changing the behavior.
Noticed that the aforementioned commit changed the effective behavior from if (A || B) { set flag } to if (A && B) { set flag }, and that didn't seem to be necessary for the goals stated in the commit; restructured it to return the if (A || B) behavior, confirmed the test case now passes as expected.