projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[cascardo/linux.git]
/
fs
/
bio.c
diff --git
a/fs/bio.c
b/fs/bio.c
index
b2dd42e
..
b1bc722
100644
(file)
--- a/
fs/bio.c
+++ b/
fs/bio.c
@@
-1969,7
+1969,7
@@
int bio_associate_current(struct bio *bio)
/* associate blkcg if exists */
rcu_read_lock();
- css = task_css(current, blkio_
subsys
_id);
+ css = task_css(current, blkio_
cgrp
_id);
if (css && css_tryget(css))
bio->bi_css = css;
rcu_read_unlock();