r364746 broke ZFS legacy mounts and zvol imports. Systems with UFS root and a collection of ZFS legacy mounts, zvols and regular ZFS mounts fail to boot, a) not discovering zvols and failing to mount legacy zfs datasets and the nullfs mounts that rely on them.
I am open to the idea of separating the added function into a separate file to be executed prior to rc.d/zvol.