diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 07:45:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 07:45:10 -0700 |
| commit | 8e775167d54e6521e7cdbc03ee7ec42a8c67b49a (patch) | |
| tree | a49914306fb28505c6e21a456df8bdc40d6eac23 /block/blk.h | |
| parent | 4b37ba90f49d4157ac5628f8d730d3505f176724 (diff) | |
| parent | f253b86b4ad1b3220544e75880510fd455ebd23f (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "block: fix accounting bug on cross partition merges"
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 1e675e5ade0..2db8f32838e 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 |