|
@@ -591,7 +591,6 @@ retry:
|
|
mem_cgroup_out_of_memory(mem, gfp_mask);
|
|
mem_cgroup_out_of_memory(mem, gfp_mask);
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
- congestion_wait(WRITE, HZ/10);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
pc->ref_cnt = 1;
|
|
pc->ref_cnt = 1;
|
|
@@ -599,7 +598,7 @@ retry:
|
|
pc->page = page;
|
|
pc->page = page;
|
|
pc->flags = PAGE_CGROUP_FLAG_ACTIVE;
|
|
pc->flags = PAGE_CGROUP_FLAG_ACTIVE;
|
|
if (ctype == MEM_CGROUP_CHARGE_TYPE_CACHE)
|
|
if (ctype == MEM_CGROUP_CHARGE_TYPE_CACHE)
|
|
- pc->flags |= PAGE_CGROUP_FLAG_CACHE;
|
|
|
|
|
|
+ pc->flags = PAGE_CGROUP_FLAG_CACHE;
|
|
|
|
|
|
lock_page_cgroup(page);
|
|
lock_page_cgroup(page);
|
|
if (page_get_page_cgroup(page)) {
|
|
if (page_get_page_cgroup(page)) {
|