files: Move ns files into files image

Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/cr-restore.c

@@ -255,7 +255,6 @@ static int crtools_prepare_shared(void)
  */
 
 static struct collect_image_info *cinfos[] = {
-	&nsfile_cinfo,
 	&pipe_cinfo,
 	&fifo_cinfo,
 	&unix_sk_cinfo,
@@ -279,6 +278,7 @@ static struct collect_image_info *cinfos[] = {
 };
 
 static struct collect_image_info *cinfos_files[] = {
+	&nsfile_cinfo,
 };
 
 /* These images are requered to restore namespaces */

criu/files.c

@@ -1691,6 +1691,9 @@ static int collect_one_file(void *o, ProtobufCMessage *base, struct cr_img *i)
 	case FD_TYPES__INETSK:
 		ret = collect_one_file_entry(fe, fe->isk->id, &fe->isk->base, &inet_sk_cinfo);
 		break;
+	case FD_TYPES__NS:
+		ret = collect_one_file_entry(fe, fe->nsf->id, &fe->nsf->base, &nsfile_cinfo);
+		break;
 	}
 
 	return ret;

criu/include/image-desc.h

@@ -57,7 +57,6 @@ enum {
 	CR_FD_FILES,
 	CR_FD_SK_QUEUES,
 	CR_FD_EXT_FILES,
-	CR_FD_NS_FILES,
 	CR_FD_UNIXSK,
 	CR_FD_PACKETSK,
 	CR_FD_NETLINK_SK,
@@ -106,6 +105,7 @@ enum {
 	CR_FD_EVENTPOLL_TFD,
 	CR_FD_REG_FILES,
 	CR_FD_INETSK,
+	CR_FD_NS_FILES,
 
 	CR_FD_AUTOFS,
 

criu/namespaces.c

@@ -464,7 +464,8 @@ static unsigned int get_ns_id(int pid, struct ns_desc *nd, protobuf_c_boolean *s
 
 int dump_one_ns_file(int lfd, u32 id, const struct fd_parms *p)
 {
-	struct cr_img *img = img_from_set(glob_imgset, CR_FD_NS_FILES);
+	struct cr_img *img;
+	FileEntry fe = FILE_ENTRY__INIT;
 	NsFileEntry nfe = NS_FILE_ENTRY__INIT;
 	struct fd_link *link = p->link;
 	struct ns_id *nsid;
@@ -480,7 +481,12 @@ int dump_one_ns_file(int lfd, u32 id, const struct fd_parms *p)
 	nfe.ns_cflag	= link->ns_d->cflag;
 	nfe.flags	= p->flags;
 
-	return pb_write_one(img, &nfe, PB_NS_FILE);
+	fe.type = FD_TYPES__NS;
+	fe.id = nfe.id;
+	fe.nsf = &nfe;
+
+	img = img_from_set(glob_imgset, CR_FD_FILES);
+	return pb_write_one(img, &fe, PB_FILE);
 }
 
 const struct fdtype_ops nsfile_dump_ops = {

images/fdinfo.proto

@@ -2,6 +2,7 @@ syntax = "proto2";
 
 import "regfile.proto";
 import "sk-inet.proto";
+import "ns.proto";
 
 enum fd_types {
 	UND		= 0;
@@ -36,4 +37,5 @@ message file_entry {
 	required uint32			id	= 2;
 	optional reg_file_entry		reg	= 3;
 	optional inet_sk_entry		isk	= 4;
+	optional ns_file_entry		nsf	= 5;
 }