cstyle fixes
./scripts/cstyle.sh -cp include/sys/zvol* module/zfs/zvol* shows zero issues

Additional style cleanups
visually located issues, cstyle.sh still shows none.