diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-24 22:06:02 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-24 22:06:02 +0200 |
| commit | f253b86b4ad1b3220544e75880510fd455ebd23f (patch) | |
| tree | cc2dd76b8ffc8df4356c1e95bd15276169dd335e /block/blk.h | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
| download | lwn-f253b86b4ad1b3220544e75880510fd455ebd23f.tar.gz lwn-f253b86b4ad1b3220544e75880510fd455ebd23f.zip | |
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>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/blk.h b/block/blk.h index 1e675e5ade02..2db8f32838e7 100644 --- a/block/blk.h +++ b/block/blk.h @@ -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 |