[Devel] [PATCH rh7] ub: zap unused task_beancounter fields

[Vladimir Davydov]

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 bd723b86949e..e639a458776e 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_ */
-- 
2.1.4