Merge remote-tracking branch 'gpio-lw/for-next'

[karo-tx-linux.git] / mm / hugetlb_cgroup.c

diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index 680e4819e0775ed50bdb7e928b62cf44a9d005aa..a3f358fb8a0c81bcb7cca5ce7c52c29f002b4261 100644 (file)
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -213,6 +213,7 @@ done:
        return ret;
 }
 
+/* Should be called with hugetlb_lock held */
 void hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages,
                                  struct hugetlb_cgroup *h_cg,
                                  struct page *page)
@@ -220,9 +221,7 @@ void hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages,
        if (hugetlb_cgroup_disabled() || !h_cg)
                return;
 
-       spin_lock(&hugetlb_lock);
        set_hugetlb_cgroup(page, h_cg);
-       spin_unlock(&hugetlb_lock);
        return;
 }
 
@@ -386,9 +385,14 @@ int __init hugetlb_cgroup_file_init(int idx)
        return 0;
 }
 
+/*
+ * hugetlb_lock will make sure a parallel cgroup rmdir won't happen
+ * when we migrate hugepages
+ */
 void hugetlb_cgroup_migrate(struct page *oldhpage, struct page *newhpage)
 {
        struct hugetlb_cgroup *h_cg;
+       struct hstate *h = page_hstate(oldhpage);
 
        if (hugetlb_cgroup_disabled())
                return;
@@ -397,12 +401,11 @@ void hugetlb_cgroup_migrate(struct page *oldhpage, struct page *newhpage)
        spin_lock(&hugetlb_lock);
        h_cg = hugetlb_cgroup_from_page(oldhpage);
        set_hugetlb_cgroup(oldhpage, NULL);
-       cgroup_exclude_rmdir(&h_cg->css);
 
        /* move the h_cg details to new cgroup */
        set_hugetlb_cgroup(newhpage, h_cg);
+       list_move(&newhpage->lru, &h->hugepage_activelist);
        spin_unlock(&hugetlb_lock);
-       cgroup_release_and_wakeup_rmdir(&h_cg->css);
        return;
 }