Revert "[PATCH 1/4] block: prepare I/O context code for BFQ-v6r2 for 2.6.39"

This reverts commit a46bd8df54075b45aa4edbf074c9ffd3187106b7.