git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
block
/
blk-throttle.c
diff --git
a/block/blk-throttle.c
b/block/blk-throttle.c
index
a62be8d
..
3689f83
100644
(file)
--- a/
block/blk-throttle.c
+++ b/
block/blk-throttle.c
@@
-927,7
+927,7
@@
static int throtl_dispatch(struct request_queue *q)
bio_list_init(&bio_list_on_stack);
bio_list_init(&bio_list_on_stack);
- throtl_log(td, "dispatch nr_queued=%
lu
read=%u write=%u",
+ throtl_log(td, "dispatch nr_queued=%
d
read=%u write=%u",
total_nr_queued(td), td->nr_queued[READ],
td->nr_queued[WRITE]);
total_nr_queued(td), td->nr_queued[READ],
td->nr_queued[WRITE]);
@@
-1204,7
+1204,7
@@
int blk_throtl_bio(struct request_queue *q, struct bio **biop)
}
queue_bio:
}
queue_bio:
- throtl_log_tg(td, tg, "[%c] bio. bdisp=%u sz=%u bps=%llu"
+ throtl_log_tg(td, tg, "[%c] bio. bdisp=%
ll
u sz=%u bps=%llu"
" iodisp=%u iops=%u queued=%d/%d",
rw == READ ? 'R' : 'W',
tg->bytes_disp[rw], bio->bi_size, tg->bps[rw],
" iodisp=%u iops=%u queued=%d/%d",
rw == READ ? 'R' : 'W',
tg->bytes_disp[rw], bio->bi_size, tg->bps[rw],