Revert "block: Remove extra discard_alignment from hd_struct."