diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 07:22:15 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 07:22:15 +0900 |
| commit | 3d0aa366072a194c6a339d37b85d5b99e936097e (patch) | |
| tree | df3b8adee09008de17234d5e5cec1bed756907d4 | |
| parent | dc5bc3f1e3d886ce1193281bb2bfb2b44f4aeae4 (diff) | |
| parent | 174fd8d369613c4e06660f3704caaba48dac8554 (diff) | |
| download | linux-3d0aa366072a194c6a339d37b85d5b99e936097e.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull blkcg fix from Jens Axboe:
"One final fix that should go into 4.3. It's a simple 2x1 liner,
fixing a blkcg accounting issue. It was using the wrong bio member to
look at the sync and write bits..."
* 'for-linus' of git://git.kernel.dk/linux-block:
blkcg: fix incorrect read/write sync/async stat accounting
| -rw-r--r-- | include/linux/blk-cgroup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index 0a5cc7a1109b..c02e669945e9 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -713,9 +713,9 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q, if (!throtl) { blkg = blkg ?: q->root_blkg; - blkg_rwstat_add(&blkg->stat_bytes, bio->bi_flags, + blkg_rwstat_add(&blkg->stat_bytes, bio->bi_rw, bio->bi_iter.bi_size); - blkg_rwstat_add(&blkg->stat_ios, bio->bi_flags, 1); + blkg_rwstat_add(&blkg->stat_ios, bio->bi_rw, 1); } rcu_read_unlock(); |