From cf2b351e0a03b9b64b20ef113c0395977b3deca5 Mon Sep 17 00:00:00 2001 From: Gui Jianfeng Date: Mon, 1 Feb 2010 09:58:54 +0100 Subject: [PATCH] --- yaml --- r: 180166 b: refs/heads/master c: bcf4dd43424cdfd8195f3955300a579fe58e9911 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-cgroup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 66d6d5995082..99d647dbeaa0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e9432c267e4047db98b9d4fba95099c6effcef9 +refs/heads/master: bcf4dd43424cdfd8195f3955300a579fe58e9911 diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c index 1fa2654db0a6..e7dbbaf5fb3e 100644 --- a/trunk/block/blk-cgroup.c +++ b/trunk/block/blk-cgroup.c @@ -147,16 +147,16 @@ blkiocg_weight_write(struct cgroup *cgroup, struct cftype *cftype, u64 val) return -EINVAL; blkcg = cgroup_to_blkio_cgroup(cgroup); + spin_lock(&blkio_list_lock); spin_lock_irq(&blkcg->lock); blkcg->weight = (unsigned int)val; hlist_for_each_entry(blkg, n, &blkcg->blkg_list, blkcg_node) { - spin_lock(&blkio_list_lock); list_for_each_entry(blkiop, &blkio_list, list) blkiop->ops.blkio_update_group_weight_fn(blkg, blkcg->weight); - spin_unlock(&blkio_list_lock); } spin_unlock_irq(&blkcg->lock); + spin_unlock(&blkio_list_lock); return 0; }