This stuff doesn't belong to block layer, and was put there only
because a better home didn't exist then.  Now it does.
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>