diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:17:50 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:17:50 +0900 |
| commit | 78daa87b1d332e4ac963c793a4157533d57501c7 (patch) | |
| tree | c133840b219a446c11fa2391bb0d887e71f5809f /block | |
| parent | d4d2ad948e9a9c316e72fdc09d7490dfda4773da (diff) | |
| parent | bbe425cd9ae83eacd0c9f09df2bf56dc911a54cd (diff) | |
| download | linux-78daa87b1d332e4ac963c793a4157533d57501c7.tar.gz linux-78daa87b1d332e4ac963c793a4157533d57501c7.tar.bz2 linux-78daa87b1d332e4ac963c793a4157533d57501c7.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: fix build for PROC_FS disabled
block: fix amiga and atari floppy driver compile warning
blk-throttle: Fix calculation of max number of WRITES to be dispatched
ioprio: grab rcu_read_lock in sys_ioprio_{set,get}()
xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests
xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
xen/blkfront: change blk_shadow.request to proper pointer
xen/blkfront: map REQ_FLUSH into a full barrier
Diffstat (limited to 'block')
| -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, { unsigned int nr_reads = 0, nr_writes = 0; unsigned int max_nr_reads = throtl_grp_quantum*3/4; - unsigned int max_nr_writes = throtl_grp_quantum - nr_reads; + unsigned int max_nr_writes = throtl_grp_quantum - max_nr_reads; struct bio *bio; /* Try to dispatch 75% READS and 25% WRITES */ |