[Devel] [PATCH RHEL7 COMMIT] ub: do not include block/blk-cgroup.h from io_prio.c

[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 bcfe603c58a84bb7c623d3727938ea745dd60b6a
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Tue Jun 16 19:13:47 2015 +0400

    ub: do not include block/blk-cgroup.h from io_prio.c
    
    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:
    
    It is not needed.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
    Acked-by: Dmitry Monakhov <dmonakhov at openvz.org>
---
 kernel/bc/Makefile  | 2 --
 kernel/bc/io_prio.c | 1 -
 2 files changed, 3 deletions(-)

diff --git a/kernel/bc/Makefile b/kernel/bc/Makefile
index 9cb3426..573ed02 100644
--- a/kernel/bc/Makefile
+++ b/kernel/bc/Makefile
@@ -11,6 +11,4 @@ obj-y := sys.o beancounter.o misc.o \
 
 obj-$(CONFIG_BC_PROC)  += proc.o
 obj-$(CONFIG_BC_IO_ACCOUNTING) += io_acct.o
-
-CFLAGS_io_prio.o := -Iblock
 obj-$(CONFIG_BC_IO_PRIORITY) += io_prio.o
diff --git a/kernel/bc/io_prio.c b/kernel/bc/io_prio.c
index 69f2f79..4febd1b 100644
--- a/kernel/bc/io_prio.c
+++ b/kernel/bc/io_prio.c
@@ -12,7 +12,6 @@
 #include <linux/cgroup.h>
 #include <bc/beancounter.h>
 #include <bc/proc.h>
-#include "blk-cgroup.h"
 
 static unsigned int ioprio_weight[UB_IOPRIO_MAX] = {
 	320, 365, 410, 460, 500, 550, 600, 640,