|
@@ -2333,7 +2333,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
|
|
|
* We always charge the cgroup the mm_struct belongs to.
|
|
|
* The mm_struct's mem_cgroup changes on task migration if the
|
|
|
* thread group leader migrates. It's possible that mm is not
|
|
|
- * set, if so charge the init_mm (happens for pagecache usage).
|
|
|
+ * set, if so charge the root memcg (happens for pagecache usage).
|
|
|
*/
|
|
|
if (!*ptr && !mm)
|
|
|
*ptr = root_mem_cgroup;
|
|
@@ -2833,8 +2833,6 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
|
|
|
ret = 0;
|
|
|
return ret;
|
|
|
charge_cur_mm:
|
|
|
- if (unlikely(!mm))
|
|
|
- mm = &init_mm;
|
|
|
ret = __mem_cgroup_try_charge(mm, mask, 1, memcgp, true);
|
|
|
if (ret == -EINTR)
|
|
|
ret = 0;
|
|
@@ -2899,9 +2897,6 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
|
|
|
if (PageCompound(page))
|
|
|
return 0;
|
|
|
|
|
|
- if (unlikely(!mm))
|
|
|
- mm = &init_mm;
|
|
|
-
|
|
|
if (!PageSwapCache(page))
|
|
|
ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);
|
|
|
else { /* page is swapcache/shmem */
|