---

yaml --- r: 144358 b: refs/heads/master c: c0bd3f6 h: refs/heads/master v: v3
git-mirror · May 2, 2009 · 0151b47 · 0151b47
1 parent f680681
commit 0151b47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e50cc9022d6c0b9175d804573e3f401d00d1381
+refs/heads/master: c0bd3f63ce01a1757dbce6373122a05fbf99ced7
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -1024,9 +1024,7 @@ static struct mem_cgroup *try_get_mem_cgroup_from_swapcache(struct page *page)
 		return NULL;
 
 	pc = lookup_page_cgroup(page);
-	/*
-	 * Used bit of swapcache is solid under page lock.
-	 */
+	lock_page_cgroup(pc);
 	if (PageCgroupUsed(pc)) {
 		mem = pc->mem_cgroup;
 		if (mem && !css_tryget(&mem->css))
@@ -1040,6 +1038,7 @@ static struct mem_cgroup *try_get_mem_cgroup_from_swapcache(struct page *page)
 			mem = NULL;
 		rcu_read_unlock();
 	}
+	unlock_page_cgroup(pc);
 	return mem;
 }