From b0217d4e41dc04fb81a5fa666588acbf394338ac Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Fri, 31 Oct 2014 12:14:21 +0300
Subject: [PATCH] criu: add constants about user namespaces

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 cr-show.c               | 1 +
 image-desc.c            | 1 +
 include/image-desc.h    | 1 +
 include/magic.h         | 1 +
 include/protobuf-desc.h | 1 +
 protobuf-desc.c         | 1 +
 6 files changed, 6 insertions(+)

diff --git a/cr-show.c b/cr-show.c
index f53f41065..5b2143d86 100644
--- a/cr-show.c
+++ b/cr-show.c
@@ -323,6 +323,7 @@ static struct show_image_info show_infos[] = {
 	SHOW_PLAINS(EXT_FILE),
 	SHOW_PLAIN(IRMAP_CACHE),
 	SHOW_PLAIN(CPUINFO),
+	SHOW_PLAIN(USERNS),
 
 	{ FILE_LOCKS_MAGIC,	PB_FILE_LOCK,		false,	NULL, "3:%u", },
 	{ TCP_STREAM_MAGIC,	PB_TCP_STREAM,		true,	show_tcp_stream, "1:%u 2:%u 3:%u 4:%u 12:%u", },
diff --git a/image-desc.c b/image-desc.c
index ff9043b63..4be7551ac 100644
--- a/image-desc.c
+++ b/image-desc.c
@@ -88,6 +88,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(CGROUP,	"cgroup"),
 	FD_ENTRY(TIMERFD,	"timerfd"),
 	FD_ENTRY(CPUINFO,	"cpuinfo"),
+	FD_ENTRY(USERNS,	"userns-%d"),
 
 	[CR_FD_STATS] = {
 		.fmt	= "stats-%s",
diff --git a/include/image-desc.h b/include/image-desc.h
index 257093982..94c307f79 100644
--- a/include/image-desc.h
+++ b/include/image-desc.h
@@ -26,6 +26,7 @@ enum {
 	 */
 	CR_FD_UTSNS,
 	CR_FD_MNTS,
+	CR_FD_USERNS,
 
 	_CR_FD_IPCNS_FROM,
 	CR_FD_IPC_VAR,
diff --git a/include/magic.h b/include/magic.h
index ff00a51ff..d9af16cfa 100644
--- a/include/magic.h
+++ b/include/magic.h
@@ -75,6 +75,7 @@
 #define CGROUP_MAGIC		0x59383330 /* Tikhvin */
 #define TIMERFD_MAGIC		0x50493712 /* Korocha */
 #define CPUINFO_MAGIC		0x61404013 /* Nyandoma */
+#define USERNS_MAGIC		0x55474906 /* Kazan */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC
diff --git a/include/protobuf-desc.h b/include/protobuf-desc.h
index f8b6d3330..ec4ae7e86 100644
--- a/include/protobuf-desc.h
+++ b/include/protobuf-desc.h
@@ -53,6 +53,7 @@ enum {
 	PB_CGROUP,
 	PB_TIMERFD,
 	PB_CPUINFO,
+	PB_USERNS,
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/protobuf-desc.c b/protobuf-desc.c
index ba1b37754..873fd3b39 100644
--- a/protobuf-desc.c
+++ b/protobuf-desc.c
@@ -60,6 +60,7 @@
 #include "protobuf/cgroup.pb-c.h"
 #include "protobuf/timerfd.pb-c.h"
 #include "protobuf/cpuinfo.pb-c.h"
+#include "protobuf/userns.pb-c.h"
 
 struct cr_pb_message_desc cr_pb_descs[PB_MAX];