[Devel] [PATCH RHEL7 COMMIT] ub statd: move header file from include/ to uapi/

[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 0764245bed46e604e16125ef171df73385eb3237
Author: Stanislav Kinsburskiy <skinsbursky at parallels.com>
Date:   Thu Oct 8 15:53:00 2015 +0400

    ub statd: move header file from include/ to uapi/
    
    This header doesn't contain kernel parts anymore and can be moved to user
    slace headers uapi/.
    
    Signed-off-by: Stanislav Kinsburskiy <skinsbursky at parallels.com>
---
 include/bc/statd.h            | 63 -------------------------------------------
 include/uapi/linux/bc/statd.h | 63 +++++++++++++++++++++++++++++++++++++++++++
 kernel/bc/statd.c             |  2 +-
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/include/bc/statd.h b/include/bc/statd.h
deleted file mode 100644
index 377a8c4..0000000
--- a/include/bc/statd.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  include/bc/statd.h
- *
- *  Copyright (C) 2005  SWsoft
- *  All rights reserved.
- *  
- *  Licensing governed by "linux/COPYING.SWsoft" file.
- *
- */
-
-#ifndef __BC_STATD_H_
-#define __BC_STATD_H_
-
-/* sys_ubstat commands list */
-#define UBSTAT_READ_ONE			0x010000
-#define UBSTAT_READ_ALL			0x020000
-#define UBSTAT_READ_FULL		0x030000
-#define UBSTAT_UBLIST			0x040000
-#define UBSTAT_UBPARMNUM		0x050000
-#define UBSTAT_GETTIME			0x060000
-
-#define UBSTAT_CMD(func)		((func) & 0xF0000)
-#define UBSTAT_PARMID(func)		((func) & 0x0FFFF)
-
-#define TIME_MAX_SEC		(LONG_MAX / HZ)
-#define TIME_MAX_JIF		(TIME_MAX_SEC * HZ)
-
-typedef unsigned long ubstattime_t;
-
-typedef struct {
-	ubstattime_t	start_time;
-	ubstattime_t	end_time;
-	ubstattime_t	cur_time;
-} ubgettime_t;
-
-typedef struct {
-	long		maxinterval;
-	int		signum;
-} ubnotifrq_t;
-
-typedef struct {
-	unsigned long	maxheld;
-	unsigned long	failcnt;
-} ubstatparm_t;
-
-typedef struct {
-	unsigned long	barrier;
-	unsigned long	limit;
-	unsigned long	held;
-	unsigned long	maxheld;
-	unsigned long	minheld;
-	unsigned long	failcnt;
-	unsigned long __unused1;
-	unsigned long __unused2;
-} ubstatparmf_t;
-
-typedef struct {
-	ubstattime_t	start_time;
-	ubstattime_t	end_time;
-	ubstatparmf_t	param[0];
-} ubstatfull_t;
-
-#endif
diff --git a/include/uapi/linux/bc/statd.h b/include/uapi/linux/bc/statd.h
new file mode 100644
index 0000000..377a8c4
--- /dev/null
+++ b/include/uapi/linux/bc/statd.h
@@ -0,0 +1,63 @@
+/*
+ *  include/bc/statd.h
+ *
+ *  Copyright (C) 2005  SWsoft
+ *  All rights reserved.
+ *  
+ *  Licensing governed by "linux/COPYING.SWsoft" file.
+ *
+ */
+
+#ifndef __BC_STATD_H_
+#define __BC_STATD_H_
+
+/* sys_ubstat commands list */
+#define UBSTAT_READ_ONE			0x010000
+#define UBSTAT_READ_ALL			0x020000
+#define UBSTAT_READ_FULL		0x030000
+#define UBSTAT_UBLIST			0x040000
+#define UBSTAT_UBPARMNUM		0x050000
+#define UBSTAT_GETTIME			0x060000
+
+#define UBSTAT_CMD(func)		((func) & 0xF0000)
+#define UBSTAT_PARMID(func)		((func) & 0x0FFFF)
+
+#define TIME_MAX_SEC		(LONG_MAX / HZ)
+#define TIME_MAX_JIF		(TIME_MAX_SEC * HZ)
+
+typedef unsigned long ubstattime_t;
+
+typedef struct {
+	ubstattime_t	start_time;
+	ubstattime_t	end_time;
+	ubstattime_t	cur_time;
+} ubgettime_t;
+
+typedef struct {
+	long		maxinterval;
+	int		signum;
+} ubnotifrq_t;
+
+typedef struct {
+	unsigned long	maxheld;
+	unsigned long	failcnt;
+} ubstatparm_t;
+
+typedef struct {
+	unsigned long	barrier;
+	unsigned long	limit;
+	unsigned long	held;
+	unsigned long	maxheld;
+	unsigned long	minheld;
+	unsigned long	failcnt;
+	unsigned long __unused1;
+	unsigned long __unused2;
+} ubstatparmf_t;
+
+typedef struct {
+	ubstattime_t	start_time;
+	ubstattime_t	end_time;
+	ubstatparmf_t	param[0];
+} ubstatfull_t;
+
+#endif
diff --git a/kernel/bc/statd.c b/kernel/bc/statd.c
index f2b984c..b421ac1 100644
--- a/kernel/bc/statd.c
+++ b/kernel/bc/statd.c
@@ -23,7 +23,7 @@
 #include <asm/param.h>
 
 #include <bc/beancounter.h>
-#include <bc/statd.h>
+#include <uapi/linux/bc/statd.h>
 
 static DEFINE_SPINLOCK(ubs_notify_lock);
 static LIST_HEAD(ubs_notify_list);