proc: move parts about fdinfo from proc_parse.h into fdinfo.h

proc_parse.h is too generic and it is a bad idea to include it everywhere.
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

criu/autofs.c

@@ -4,7 +4,7 @@
 #include <sys/mount.h>
 #include <sys/wait.h>
 
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "autofs.h"
 #include "rst-malloc.h"
 #include "mount.h"

criu/cr-check.c

@@ -23,7 +23,7 @@
 #include <linux/aio_abi.h>
 #include <sys/mount.h>
 
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "sockets.h"
 #include "crtools.h"
 #include "log.h"

criu/eventfd.c

@@ -16,7 +16,7 @@
 #include "asm/types.h"
 #include "imgset.h"
 #include "eventfd.h"
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "image.h"
 #include "util.h"
 #include "log.h"

criu/eventpoll.c

@@ -17,7 +17,7 @@
 #include "imgset.h"
 #include "rst_info.h"
 #include "eventpoll.h"
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "image.h"
 #include "util.h"
 #include "log.h"

criu/files.c

@@ -37,7 +37,7 @@
 #include "timerfd.h"
 #include "imgset.h"
 #include "fs-magic.h"
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "cr_options.h"
 #include "autofs.h"
 

criu/fsnotify.c

@@ -26,7 +26,7 @@
 #include "asm/types.h"
 #include "imgset.h"
 #include "fsnotify.h"
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "mount.h"
 #include "image.h"
 #include "util.h"

criu/include/autofs.h

@@ -5,6 +5,8 @@
 #define AUTOFS_MINOR	235
 #endif
 
+#include <stdbool.h>
+
 bool is_autofs_pipe(unsigned long inode);
 
 struct mount_info;

criu/include/fdinfo.h

+#ifndef __CR_FDINFO_H__
+#define __CR_FDINFO_H__
+
+#include "list.h"
+
+#include "images/eventfd.pb-c.h"
+#include "images/eventpoll.pb-c.h"
+#include "images/signalfd.pb-c.h"
+#include "images/fsnotify.pb-c.h"
+#include "images/timerfd.pb-c.h"
+
+struct inotify_wd_entry {
+	InotifyWdEntry e;
+	FhEntry f_handle;
+	struct list_head node;
+};
+
+struct fanotify_mark_entry {
+	FanotifyMarkEntry e;
+	FhEntry f_handle;
+	struct list_head node;
+	union {
+		FanotifyInodeMarkEntry ie;
+		FanotifyMountMarkEntry me;
+	};
+};
+
+struct eventpoll_tfd_entry {
+	EventpollTfdEntry e;
+	struct list_head node;
+};
+
+union fdinfo_entries {
+	EventfdFileEntry efd;
+	SignalfdEntry sfd;
+	struct inotify_wd_entry ify;
+	struct fanotify_mark_entry ffy;
+	struct eventpoll_tfd_entry epl;
+	TimerfdEntry tfy;
+};
+
+extern void free_inotify_wd_entry(union fdinfo_entries *e);
+extern void free_fanotify_mark_entry(union fdinfo_entries *e);
+extern void free_event_poll_entry(union fdinfo_entries *e);
+
+struct fdinfo_common {
+	off64_t pos;
+	int flags;
+	int mnt_id;
+	int owner;
+};
+
+extern int parse_fdinfo(int fd, int type,
+		int (*cb)(union fdinfo_entries *e, void *arg), void *arg);
+extern int parse_fdinfo_pid(int pid, int fd, int type,
+		int (*cb)(union fdinfo_entries *e, void *arg), void *arg);
+
+#endif

criu/include/proc_parse.h

@@ -3,13 +3,7 @@
 
 #include <sys/types.h>
 #include "asm/types.h"
-#include "list.h"
 
-#include "images/eventfd.pb-c.h"
-#include "images/eventpoll.pb-c.h"
-#include "images/signalfd.pb-c.h"
-#include "images/fsnotify.pb-c.h"
-#include "images/timerfd.pb-c.h"
 #include "images/seccomp.pb-c.h"
 
 #define PROC_TASK_COMM_LEN	32
@@ -110,52 +104,6 @@ extern unsigned int parse_pid_loginuid(pid_t pid, int *err, bool ignore_noent);
 extern int parse_pid_oom_score_adj(pid_t pid, int *err);
 extern int prepare_loginuid(unsigned int value, unsigned int loglevel);
 extern int parse_pid_status(pid_t pid, struct proc_status_creds *);
-
-struct inotify_wd_entry {
-	InotifyWdEntry e;
-	FhEntry f_handle;
-	struct list_head node;
-};
-
-struct fanotify_mark_entry {
-	FanotifyMarkEntry e;
-	FhEntry f_handle;
-	struct list_head node;
-	union {
-		FanotifyInodeMarkEntry ie;
-		FanotifyMountMarkEntry me;
-	};
-};
-
-struct eventpoll_tfd_entry {
-	EventpollTfdEntry e;
-	struct list_head node;
-};
-
-union fdinfo_entries {
-	EventfdFileEntry efd;
-	SignalfdEntry sfd;
-	struct inotify_wd_entry ify;
-	struct fanotify_mark_entry ffy;
-	struct eventpoll_tfd_entry epl;
-	TimerfdEntry tfy;
-};
-
-extern void free_inotify_wd_entry(union fdinfo_entries *e);
-extern void free_fanotify_mark_entry(union fdinfo_entries *e);
-extern void free_event_poll_entry(union fdinfo_entries *e);
-
-struct fdinfo_common {
-	off64_t pos;
-	int flags;
-	int mnt_id;
-	int owner;
-};
-
-extern int parse_fdinfo(int fd, int type,
-		int (*cb)(union fdinfo_entries *e, void *arg), void *arg);
-extern int parse_fdinfo_pid(int pid, int fd, int type,
-		int (*cb)(union fdinfo_entries *e, void *arg), void *arg);
 extern int parse_file_locks(void);
 extern int get_fd_mntid(int fd, int *mnt_id);
 

criu/proc_parse.c

@@ -25,6 +25,7 @@
 #include "vma.h"
 #include "bfd.h"
 #include "proc_parse.h"
+#include "fdinfo.h"
 #include "parasite.h"
 #include "cr_options.h"
 #include "sysfs_parse.h"

criu/signalfd.c

@@ -5,7 +5,7 @@
 #include "compiler.h"
 #include "asm/types.h"
 #include "signalfd.h"
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "imgset.h"
 #include "image.h"
 #include "util.h"

criu/timerfd.c

@@ -8,7 +8,7 @@
 #include "protobuf.h"
 #include "images/timerfd.pb-c.h"
 
-#include "proc_parse.h"
+#include "fdinfo.h"
 #include "rst-malloc.h"
 #include "cr_options.h"
 #include "restorer.h"