[Devel] [PATCH RHEL7 COMMIT] ub: zap ub_{init,fini}_ioprio

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.13
------>
commit 5b98da5a1ae5014d5dc0ed72bbe5b9dc816ae9a7
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Tue Jun 16 16:28:27 2015 +0400

    ub: zap ub_{init,fini}_ioprio
    
    Patchset description:
    
    https://jira.sw.ru/browse/PSBM-34007
    
    Vladimir Davydov (7):
      ioprio: move IOPRIO_WHO_UBC handling out of rcu section
      ub: zap ub_{init,fini}_ioprio
      ub: export ub_get_{mem,blkio}_css
      ub: ressurrect ioprio_set IOPRIO_WHO_UBC
      ub: ressurrect iostat and ioprio reporting
      ub: account writeback io
      ub: do not include block/blk-cgroup.h from io_prio.c
    
    This patch description:
    
    These methods were used in RH6 to associate a blkio cgroup with a
    beancounter. Actually, we already have such an association,
    user_beancounter->blkio_css, so we do not longer need them.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
    Acked-by: Dmitry Monakhov <dmonakhov at openvz.org>
---
 include/bc/beancounter.h |  3 ---
 kernel/bc/io_prio.c      | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/include/bc/beancounter.h b/include/bc/beancounter.h
index cb908e8..f8a2c21 100644
--- a/include/bc/beancounter.h
+++ b/include/bc/beancounter.h
@@ -512,9 +512,6 @@ void ub_precharge_snapshot(struct user_beancounter *ub, int *precharge);
 #define UB_IOPRIO_MIN 0
 #define UB_IOPRIO_MAX 8
 
-extern void ub_init_ioprio(struct user_beancounter *ub);
-extern void ub_fini_ioprio(struct user_beancounter *ub);
-
 #endif /* CONFIG_BEANCOUNTERS */
 
 #ifdef CONFIG_BC_IO_PRIORITY
diff --git a/kernel/bc/io_prio.c b/kernel/bc/io_prio.c
index 83d3424..f51553c 100644
--- a/kernel/bc/io_prio.c
+++ b/kernel/bc/io_prio.c
@@ -16,16 +16,6 @@
 
 //static u64 ioprio_weight[UB_IOPRIO_MAX] = {320, 365, 410, 460, 500, 550, 600, 640};
 
-void ub_init_ioprio(struct user_beancounter *ub)
-{
-	//blkio_cgroup_set_ub(ub->blkio_cgroup, ub);
-}
-
-void ub_fini_ioprio(struct user_beancounter *ub)
-{
-	//blkio_cgroup_set_ub(ub->blkio_cgroup, &ub0);
-}
-
 int ub_set_ioprio(int id, int ioprio)
 {
 	struct user_beancounter *ub;