[Devel] [PATCH RHEL7 COMMIT] ub: zap unused task_beancounter fields

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.3.1-vz7.10.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.3.1.vz7.10.10
------>
commit 5035f8ac62a09043bb7e09d8b6d50c6f90a1f697
Author: Vladimir Davydov <vdavydov at virtuozzo.com>
Date:   Thu Feb 11 13:09:14 2016 +0400

    ub: zap unused task_beancounter fields
    
    Signed-off-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 include/bc/task.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/include/bc/task.h b/include/bc/task.h
index bd723b8..e639a45 100644
--- a/include/bc/task.h
+++ b/include/bc/task.h
@@ -17,9 +17,7 @@ struct callback_head;
 #ifdef CONFIG_BEANCOUNTERS
 struct task_beancounter {
 	struct user_beancounter	*exec_ub;
-	struct user_beancounter *saved_ub;
 	struct user_beancounter	*task_ub;
-	unsigned long oom_generation;
 	struct callback_head cgroup_attach_work;
 };
 
@@ -30,14 +28,6 @@ extern int ub_attach_task(struct user_beancounter *, struct task_struct *);
 extern struct user_beancounter ub0;
 #define get_ub0()	(&ub0)
 
-#define ub_save_context(t)	do {				\
-		t->task_bc.saved_ub = t->task_bc.exec_ub;	\
-		t->task_bc.exec_ub = get_ub0();			\
-	} while (0)
-#define ub_restore_context(t)	do {				\
-		t->task_bc.exec_ub = t->task_bc.saved_ub;	\
-	} while (0)
-
 #define get_exec_ub()		(current->task_bc.exec_ub)
 #define set_exec_ub(__newub)		\
 ({					\
@@ -56,8 +46,6 @@ extern struct user_beancounter ub0;
 #define get_exec_ub()		(NULL)
 #define get_task_ub(task)	(NULL)
 #define set_exec_ub(__ub)	(NULL)
-#define ub_save_context(t)	do { } while (0)
-#define ub_restore_context(t)	do { } while (0)
 
 #endif /* CONFIG_BEANCOUNTERS */
 #endif /* __task.h_ */