block: genhd.h cleanup patch