Vdev disk fixes

@evansus When running cstyle.pl, you need to include the -c option (and preferably -p as well).