diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-29 13:30:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-29 14:03:26 +1000 |
| commit | 30209306212a5d9a3f10ad859c6019d75ffffa00 (patch) | |
| tree | 0aa42111fed742a314c8ef218da7c38e8a4280ff /block | |
| parent | 1c0b894af4e084cae23109d379d705b992dbc81f (diff) | |
| parent | 2a0010af17b1739ef8ea8cf02647a127241ee674 (diff) | |
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
include/linux/res_counter.h
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index f2b292925ccd..4e595ee8c915 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -247,9 +247,7 @@ static inline int blkg_path(struct blkcg_gq *blkg, char *buf, int buflen) { int ret; - rcu_read_lock(); ret = cgroup_path(blkg->blkcg->css.cgroup, buf, buflen); - rcu_read_unlock(); if (ret) strncpy(buf, "<unavailable>", buflen); return ret; |