Since PROC_*_INIT_INO are all defined relative to PROC_DYNAMIC_FIRST, make it
explicit.
Signed-off-by: Richard Guy Briggs <rgb@xxxxxxxxxx>
---
fs/proc/generic.c | 3 +--
include/linux/proc_ns.h | 9 +++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index b7f268e..9f7726a 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -11,6 +11,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/proc_fs.h>
+#include <linux/proc_ns.h>
#include <linux/stat.h>
#include <linux/mm.h>
#include <linux/module.h>
@@ -121,8 +122,6 @@ static int xlate_proc_name(const char *name, struct proc_dir_entry **ret,
static DEFINE_IDA(proc_inum_ida);
static DEFINE_SPINLOCK(proc_inum_lock); /* protects the above */
-#define PROC_DYNAMIC_FIRST 0xF0000000U
-
/*
* Return an inode number between PROC_DYNAMIC_FIRST and
* 0xffffffff, or zero on failure.
diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
index 09ff93c..340372b 100644
--- a/include/linux/proc_ns.h
+++ b/include/linux/proc_ns.h
@@ -32,12 +32,13 @@ extern const struct proc_ns_operations *ns_entries[];
/*
* We always define these enumerators
*/
+#define PROC_DYNAMIC_FIRST 0xF0000000U
enum {
PROC_ROOT_INO = 1,
- PROC_IPC_INIT_INO = 0xEFFFFFFFU,
- PROC_UTS_INIT_INO = 0xEFFFFFFEU,
- PROC_USER_INIT_INO = 0xEFFFFFFDU,
- PROC_PID_INIT_INO = 0xEFFFFFFCU,
+ PROC_IPC_INIT_INO = PROC_DYNAMIC_FIRST - 1,
+ PROC_UTS_INIT_INO = PROC_DYNAMIC_FIRST - 2,
+ PROC_USER_INIT_INO = PROC_DYNAMIC_FIRST - 3,
+ PROC_PID_INIT_INO = PROC_DYNAMIC_FIRST - 4,
};
#ifdef CONFIG_PROC_FS
--
1.7.1
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/containers
