Revert "block: fix accounting bug on cross partition merges"
This reverts commit 7681bfee. Conflicts: include/linux/genhd.h It has numerous issues with the cleanup path and non-elevator devices. Revert it for now so we can come up with a clean version without rushing things. Signed-off-by: Jens Axboe <email@example.com>
Showing with 13 additions and 47 deletions