diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
| commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
| tree | d2cebc7039954851998d592123899f5627def7a9 /block/blk-throttle.c | |
| parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Diffstat (limited to 'block/blk-throttle.c')
| -rw-r--r-- | block/blk-throttle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 56ad4531b412..004be80fd894 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c | |||
| @@ -645,7 +645,7 @@ static int throtl_dispatch_tg(struct throtl_data *td, struct throtl_grp *tg, | |||
| 645 | { | 645 | { |
| 646 | unsigned int nr_reads = 0, nr_writes = 0; | 646 | unsigned int nr_reads = 0, nr_writes = 0; |
| 647 | unsigned int max_nr_reads = throtl_grp_quantum*3/4; | 647 | unsigned int max_nr_reads = throtl_grp_quantum*3/4; |
| 648 | unsigned int max_nr_writes = throtl_grp_quantum - nr_reads; | 648 | unsigned int max_nr_writes = throtl_grp_quantum - max_nr_reads; |
| 649 | struct bio *bio; | 649 | struct bio *bio; |
| 650 | 650 | ||
| 651 | /* Try to dispatch 75% READS and 25% WRITES */ | 651 | /* Try to dispatch 75% READS and 25% WRITES */ |