Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-2
+2
-2
include/linux/blk-cgroup.h
+2
-2
include/linux/blk-cgroup.h
···
713
713
714
714
if (!throtl) {
715
715
blkg = blkg ?: q->root_blkg;
716
-
blkg_rwstat_add(&blkg->stat_bytes, bio->bi_flags,
716
+
blkg_rwstat_add(&blkg->stat_bytes, bio->bi_rw,
717
717
bio->bi_iter.bi_size);
718
-
blkg_rwstat_add(&blkg->stat_ios, bio->bi_flags, 1);
718
+
blkg_rwstat_add(&blkg->stat_ios, bio->bi_rw, 1);
719
719
}
720
720
721
721
rcu_read_unlock();