block: cleanup some of the integrity stuff in blkdev.h