Revert "block: fix accounting bug on cross partition merges"
authorJens Axboe <jaxboe@fusionio.com>
Sun, 24 Oct 2010 20:06:02 +0000 (22:06 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Sun, 24 Oct 2010 20:06:02 +0000 (22:06 +0200)
commitf253b86b4ad1b3220544e75880510fd455ebd23f
treecc2dd76b8ffc8df4356c1e95bd15276169dd335e
parent35da7a307c535f9c2929cae277f3df425c9f9b1e
Revert "block: fix accounting bug on cross partition merges"

This reverts commit 7681bfeeccff5efa9eb29bf09249a3c400b15327.

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 <jaxboe@fusionio.com>
block/blk-core.c
block/blk-merge.c
block/blk.h
block/genhd.c
fs/partitions/check.c
include/linux/blkdev.h
include/linux/elevator.h
include/linux/genhd.h