Sync with SpectraBSD/stable @ 664512.

Mostly diff reduction, but there is also a fix for zio_write_gang_block().