[Devel] [PATCH RHEL7 COMMIT] ub: drop ubc_ioprio knob

[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.5
------>
commit 5bdcc62ebadc6934a6a360eaa57588baa0aff282
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Mon May 25 14:28:12 2015 +0400

    ub: drop ubc_ioprio knob
    
    In RH6 it allows to disable using the blkio cgroup (on by default). In
    RH7 we can do that from userspace, because cgroups are controlled from
    the userspace. Keeping it in the compat interface (syscalls), which is
    going to die anyway, looks meaningless and only clutters the code. Drop
    it, and always enable blkiocg if using ub syscalls.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 kernel/bc/beancounter.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/kernel/bc/beancounter.c b/kernel/bc/beancounter.c
index fb0530b..dae10df2 100644
--- a/kernel/bc/beancounter.c
+++ b/kernel/bc/beancounter.c
@@ -80,8 +80,6 @@ const char *ub_rnames[] = {
 
 unsigned int ub_dcache_threshold __read_mostly = 4 * 1024; /* ~7Mb per container */
 
-static int ubc_ioprio = 1;
-
 /* default maximum perpcu resources precharge */
 int ub_resource_precharge[UB_RESOURCES] = {
 	[UB_PRIVVMPAGES]= 256,
@@ -129,8 +127,6 @@ static int ub_blkio_cgroup_attach_task(struct user_beancounter *ub,
 	struct cgroup *cg;
 	int ret;
 
-	if (!ubc_ioprio)
-		return 0;
 	cg = ub_cgroup_open(blkio_cgroup_root, ub);
 	if (IS_ERR(cg))
 		return PTR_ERR(cg);
@@ -1051,13 +1047,6 @@ static ctl_table ub_sysctl_table[] = {
 		.mode		= 0644,
 		.proc_handler	= &proc_dointvec,
 	},
-	{
-		.procname	= "ioprio",
-		.data		= &ubc_ioprio,
-		.maxlen		= sizeof(ubc_ioprio),
-		.mode		= 0644,
-		.proc_handler	= &proc_dointvec,
-	},
 #ifdef CONFIG_BC_IO_ACCOUNTING
 	{
 		.procname	= "dirty_ratio",
@@ -1140,10 +1129,3 @@ int __init ub_init_cgroup(void)
 	return 0;
 }
 late_initcall(ub_init_cgroup);
-
-static int __init parse_ubc_ioprio(char *arg)
-{
-	ubc_ioprio = simple_strtoul(arg, NULL, 0);
-	return 0;
-}
-__setup("ubc.ioprio=", parse_ubc_ioprio);