[v3,10/33] ns: Rename and export userns_id() and INVALID_ID

Submitted by Kirill Tkhai on Feb. 16, 2017, 12:08 p.m.

Details

Message ID 148724688481.22444.9398792020154980278.stgit@localhost.localdomain
State New
Series "Nested user namespaces support"
Headers show

Commit Message

Kirill Tkhai Feb. 16, 2017, 12:08 p.m. 
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 criu/include/namespaces.h |    3 +++
 criu/namespaces.c         |   13 ++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index 642f04cf9..86a7a15b8 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -49,6 +49,8 @@ 
 #define NS_GET_PARENT   _IO(NSIO, 0x2)
 #endif
 
+#define NS_INVALID_XID (~0U)
+
 struct ns_desc {
 	unsigned int	cflag;
 	char		*str;
@@ -128,6 +130,7 @@  extern struct ns_id *ns_ids;
 	}
 
 extern bool check_ns_proc(struct fd_link *link);
+extern unsigned int child_userns_xid(unsigned int xid, UidGidExtent **map, int n);
 
 extern struct ns_desc pid_ns_desc;
 extern struct ns_desc user_ns_desc;
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 352c4f36d..046915917 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -750,9 +750,8 @@  static int set_ns_hookups(struct ns_id *ns)
 
 /* Mapping NS_ROOT to NS_CRIU */
 static UsernsEntry *userns_entry;
-#define INVALID_ID (~0U)
 
-static unsigned int userns_id(unsigned int id, UidGidExtent **map, int n)
+unsigned int child_userns_xid(unsigned int id, UidGidExtent **map, int n)
 {
 	int i;
 
@@ -762,7 +761,7 @@  static unsigned int userns_id(unsigned int id, UidGidExtent **map, int n)
 			return map[i]->first + (id - map[i]->lower_first);
 	}
 
-	return INVALID_ID;
+	return NS_INVALID_XID;
 }
 
 static unsigned int parent_userns_id(unsigned int id, UidGidExtent **map, int n)
@@ -778,7 +777,7 @@  static unsigned int parent_userns_id(unsigned int id, UidGidExtent **map, int n)
 			return map[i]->lower_first + (id - map[i]->first);
 	}
 
-	return INVALID_ID;
+	return NS_INVALID_XID;
 }
 
 static uid_t parent_userns_uid(UsernsEntry *e, uid_t uid)
@@ -798,7 +797,7 @@  uid_t userns_uid(uid_t uid)
 	if (!(root_ns_mask & CLONE_NEWUSER) || !e)
 		return uid;
 
-	return userns_id(uid, e->uid_map, e->n_uid_map);
+	return child_userns_xid(uid, e->uid_map, e->n_uid_map);
 }
 
 gid_t userns_gid(gid_t gid)
@@ -808,7 +807,7 @@  gid_t userns_gid(gid_t gid)
 	if (!(root_ns_mask & CLONE_NEWUSER) || !e)
 		return gid;
 
-	return userns_id(gid, e->gid_map, e->n_gid_map);
+	return child_userns_xid(gid, e->gid_map, e->n_gid_map);
 }
 
 static int parse_id_map(pid_t pid, char *name, UidGidExtent ***pb_exts)
@@ -948,7 +947,7 @@  static int check_user_ns(struct ns_id *ns)
 
 		uid = parent_userns_uid(e, 0);
 		gid = parent_userns_gid(e, 0);
-		if (uid == INVALID_ID || gid == INVALID_ID) {
+		if (uid == NS_INVALID_XID || gid == NS_INVALID_XID) {
 			pr_err("Unable to convert uid or gid\n");
 			return -1;
 		}