3 files changed, 19 insertions, 20 deletions

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 3e3318ddfc0e..56174c7199ee 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -406,19 +406,19 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
 
 static inline void mem_cgroup_oom_enable(void)
 {
-        WARN_ON(current->memcg_oom.may_oom);
-        current->memcg_oom.may_oom = 1;
+        WARN_ON(current->memcg_may_oom);
+        current->memcg_may_oom = 1;
 }
 
 static inline void mem_cgroup_oom_disable(void)
 {
-        WARN_ON(!current->memcg_oom.may_oom);
-        current->memcg_oom.may_oom = 0;
+        WARN_ON(!current->memcg_may_oom);
+        current->memcg_may_oom = 0;
 }
 
 static inline bool task_in_memcg_oom(struct task_struct *p)
 {
-        return p->memcg_oom.memcg;
+        return p->memcg_in_oom;
 }
 
 bool mem_cgroup_oom_synchronize(bool wait);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 5423b9c82fee..17bf8b845aa0 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1473,7 +1473,9 @@ struct task_struct {
         unsigned sched_reset_on_fork:1;
         unsigned sched_contributes_to_load:1;
         unsigned sched_migrated:1;
-
+#ifdef CONFIG_MEMCG
+        unsigned memcg_may_oom:1;
+#endif
 #ifdef CONFIG_MEMCG_KMEM
         unsigned memcg_kmem_skip_account:1;
 #endif
@@ -1804,12 +1806,9 @@ struct task_struct {
         unsigned long trace_recursion;
 #endif /* CONFIG_TRACING */
 #ifdef CONFIG_MEMCG
-        struct memcg_oom_info {
-                struct mem_cgroup *memcg;
-                gfp_t gfp_mask;
-                int order;
-                unsigned int may_oom:1;
-        } memcg_oom;
+        struct mem_cgroup *memcg_in_oom;
+        gfp_t memcg_oom_gfp_mask;
+        int memcg_oom_order;
 #endif
 #ifdef CONFIG_UPROBES
         struct uprobe_task *utask;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c57c4423c688..47bd7f13f526 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1661,7 +1661,7 @@ static void memcg_oom_recover(struct mem_cgroup *memcg)
 
 static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
 {
-        if (!current->memcg_oom.may_oom)
+        if (!current->memcg_may_oom)
                 return;
         /*
          * We are in the middle of the charge context here, so we
@@ -1678,9 +1678,9 @@ static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
          * and when we know whether the fault was overall successful.
          */
         css_get(&memcg->css);
-        current->memcg_oom.memcg = memcg;
-        current->memcg_oom.gfp_mask = mask;
-        current->memcg_oom.order = order;
+        current->memcg_in_oom = memcg;
+        current->memcg_oom_gfp_mask = mask;
+        current->memcg_oom_order = order;
 }
 
 /**
@@ -1702,7 +1702,7 @@ static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
  */
 bool mem_cgroup_oom_synchronize(bool handle)
 {
-        struct mem_cgroup *memcg = current->memcg_oom.memcg;
+        struct mem_cgroup *memcg = current->memcg_in_oom;
         struct oom_wait_info owait;
         bool locked;
 
@@ -1730,8 +1730,8 @@ bool mem_cgroup_oom_synchronize(bool handle)
         if (locked && !memcg->oom_kill_disable) {
                 mem_cgroup_unmark_under_oom(memcg);
                 finish_wait(&memcg_oom_waitq, &owait.wait);
-                mem_cgroup_out_of_memory(memcg, current->memcg_oom.gfp_mask,
-                                         current->memcg_oom.order);
+                mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask,
+                                         current->memcg_oom_order);
         } else {
                 schedule();
                 mem_cgroup_unmark_under_oom(memcg);
@@ -1748,7 +1748,7 @@ bool mem_cgroup_oom_synchronize(bool handle)
                 memcg_oom_recover(memcg);
         }
 cleanup:
-        current->memcg_oom.memcg = NULL;
+        current->memcg_in_oom = NULL;
         css_put(&memcg->css);
         return true;
 }