Skip to content

Commit

Permalink
cgroup: fix root_count when mount fails due to busy subsystem
Browse files Browse the repository at this point in the history
root_count was being incremented in cgroup_get_sb() after all error
checking was complete, but decremented in cgroup_kill_sb(), which can be
called on a superblock that we gave up on due to an error.  This patch
changes cgroup_kill_sb() to only decrement root_count if the root was
previously linked into the list of roots.

Signed-off-by: Paul Menage <menage@google.com>
Tested-by: Serge Hallyn <serue@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Paul Menage authored and Linus Torvalds committed Jan 30, 2009
1 parent 804b3c2 commit 839ec54
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1115,8 +1115,10 @@ static void cgroup_kill_sb(struct super_block *sb) {
}
write_unlock(&css_set_lock);

list_del(&root->root_list);
root_count--;
if (!list_empty(&root->root_list)) {
list_del(&root->root_list);
root_count--;
}

mutex_unlock(&cgroup_mutex);

Expand Down

0 comments on commit 839ec54

Please sign in to comment.