image: fanotify -- Add scaffold code for fanotify objects

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

fsnotify.c

@@ -78,6 +78,16 @@ void show_inotify(int fd_inotify, struct cr_options *o)
 	pb_show_plain(fd_inotify, PB_INOTIFY);
 }
 
+void show_fanotify_mark(int fd, struct cr_options *o)
+{
+	pb_show_plain(fd, PB_FANOTIFY_MARK);
+}
+
+void show_fanotify(int fd, struct cr_options *o)
+{
+	pb_show_plain(fd, PB_FANOTIFY);
+}
+
 static int dump_inotify_entry(union fdinfo_entries *e, void *arg)
 {
 	InotifyWdEntry *we = &e->ify;

image.c

@@ -105,6 +105,8 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
 	FD_ENTRY(SIGNALFD,	"signalfd",	 show_signalfd),
 	FD_ENTRY(INOTIFY,	"inotify",	 show_inotify),
 	FD_ENTRY(INOTIFY_WD,	"inotify-wd",	 show_inotify_wd),
+	FD_ENTRY(FANOTIFY,	"fanotify",	 show_fanotify),
+	FD_ENTRY(FANOTIFY_MARK,	"fanotify-mark", show_fanotify_mark),
 	FD_ENTRY(CORE,		"core-%d",	 show_core),
 	FD_ENTRY(IDS,		"ids-%d",	 show_ids),
 	FD_ENTRY(MM,		"mm-%d",	 show_mm),

include/crtools.h

@@ -77,6 +77,8 @@ enum {
 	CR_FD_SIGNALFD,
 	CR_FD_INOTIFY,
 	CR_FD_INOTIFY_WD,
+	CR_FD_FANOTIFY,
+	CR_FD_FANOTIFY_MARK,
 	_CR_FD_GLOB_TO,
 
 	CR_FD_TMPFS,

include/fsnotify.h

@@ -15,5 +15,7 @@ extern int dump_inotify(struct fd_parms *p, int lfd, const int fdinfo);
 extern int collect_inotify(void);
 extern void show_inotify_wd(int fd_inotify_wd, struct cr_options *o);
 extern void show_inotify(int fd_inotify, struct cr_options *o);
+extern void show_fanotify_mark(int fd, struct cr_options *o);
+extern void show_fanotify(int fd, struct cr_options *o);
 
 #endif /* __CR_FSNOTIFY_H__ */

include/image.h

@@ -63,6 +63,8 @@
 #define TTY_MAGIC		0x59433025 /* Pushkin */
 #define TTY_INFO_MAGIC		0x59453036 /* Kolpino */
 #define RLIMIT_MAGIC		0x57113925 /* Rostov */
+#define FANOTIFY_MAGIC		0x55096122 /* Chelyabinsk */
+#define FANOTIFY_MARK_MAGIC	0x56506035 /* Yekaterinburg */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC

include/protobuf.h

@@ -41,6 +41,8 @@ enum {
 	PB_SIGNALFD,
 	PB_INOTIFY,
 	PB_INOTIFY_WD,
+	PB_FANOTIFY,
+	PB_FANOTIFY_MARK,
 	PB_TTY,
 	PB_TTY_INFO,
 	PB_RLIMIT,

protobuf.c

@@ -97,6 +97,8 @@ void cr_pb_init(void)
 	CR_PB_DESC(SIGNALFD,		Signalfd,	signalfd);
 	CR_PB_DESC(INOTIFY,		InotifyFile,	inotify_file);
 	CR_PB_DESC(INOTIFY_WD,		InotifyWd,	inotify_wd);
+	CR_PB_DESC(FANOTIFY,		FanotifyFile,	fanotify_file);
+	CR_PB_DESC(FANOTIFY_MARK,	FanotifyMark,	fanotify_mark);
 	CR_PB_DESC(CORE,		Core,		core);
 	CR_PB_DESC(IDS,			TaskKobjIds,	task_kobj_ids);
 	CR_PB_DESC(MM,			Mm,		mm);

protobuf/fdinfo.proto

@@ -11,6 +11,7 @@ enum fd_types {
 	SIGNALFD	= 9;
 	PACKETSK	= 10;
 	TTY		= 11;
+	FANOTIFY	= 12;
 }
 
 message fdinfo_entry {