Revert "Revert "block: Add BFQ 7r2""

This reverts commit 3409dd76a62d7b212da627a21ba1c14820f74dbd.