[Devel] [PATCH RHEL7 COMMIT] ub stat: enable UB statd

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.8.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.8.4
------>
commit 8d8c4c466e89978bde580b79ff6d6322ac94f704
Author: Stanislav Kinsburskiy <skinsbursky at odin.com>
Date:   Thu Oct 8 15:53:29 2015 +0400

    ub stat: enable UB statd
    
    Series description:
    ub statd: ported from rhel6
    
    This series fixes a bug, does some cleanup and headers tossing and re-enables
    ub statd system call support.
    
    https://jira.sw.ru/browse/PSBM-29338
    
    v2:
    Added synchonization between beancounter and memcg counters if required
    
    Stanislav Kinsburskiy (7):
          ub statd: fix new_notify structure allocation
          ub statd: small optimisations and clean ups
          ub statd: move struct ub_stat_notify declaration to source
          ub statd: move header file from include/ to uapi/
          ub stat: commnad check helper introduced
          ub stat: sync memcg contents with beancounter if required
          ub stat: enable UB statd
    
    ====================
    This patch description:
    
    From: Stanislav Kinsburskiy <skinsbursky at parallels.com>
    
    This commit reverts c59367f9e478eb92145d7fea5a88c10407790077
    
    Signed-off-by: Stanislav Kinsburskiy <skinsbursky at parallels.com>
---
 kernel/bc/statd.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/kernel/bc/statd.c b/kernel/bc/statd.c
index ad80e7e..84c7765 100644
--- a/kernel/bc/statd.c
+++ b/kernel/bc/statd.c
@@ -373,9 +373,6 @@ long do_ubstat(int func, unsigned long arg1, unsigned long arg2,
 	int retval;
 	struct user_beancounter *ub;
 
-	/* FIXME? */
-	return -ENOSYS;
-
 	if (func == UBSTAT_UBPARMNUM)
 		return UB_RESOURCES;
 	if (func == UBSTAT_UBLIST)
@@ -521,9 +518,6 @@ static int ubstatd(void *unused)
 
 static int __init ubstatd_init(void)
 {
-	/* FIXME? */
-	return 0;
-
 	init_timer(&ubs_timer);
 	ubs_timer.expires = TIME_MAX_JIF;
 	ubs_min_interval = TIME_MAX_SEC;