Revert "block: fix accounting bug on cross partition merges"

This reverts commit 7681bfeecc.

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 protected]>
This commit is contained in:
Jens Axboe 2010-10-24 22:06:02 +02:00
commit f253b86b4a
8 changed files with 13 additions and 47 deletions

View file

@ -116,6 +116,10 @@ void blk_queue_congestion_threshold(struct request_queue *q);
int blk_dev_init(void);
void elv_quiesce_start(struct request_queue *q);
void elv_quiesce_end(struct request_queue *q);
/*
* Return the threshold (number of used requests) at which the queue is
* considered to be congested. It include a little hysteresis to keep the