crtools: move all stuff about fdset in a separate header

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-dump.c

@@ -32,6 +32,7 @@
 
 #include "asm/types.h"
 #include "list.h"
+#include "fdset.h"
 #include "file-ids.h"
 #include "kcmp-ids.h"
 #include "compiler.h"

cr-show.c

@@ -14,6 +14,7 @@
 
 #include "asm/types.h"
 #include "list.h"
+#include "fdset.h"
 #include "namespaces.h"
 #include "compiler.h"
 #include "crtools.h"

eventfd.c

@@ -14,6 +14,7 @@
 
 #include "compiler.h"
 #include "asm/types.h"
+#include "fdset.h"
 #include "eventfd.h"
 #include "proc_parse.h"
 #include "crtools.h"

eventpoll.c

@@ -14,6 +14,7 @@
 
 #include "compiler.h"
 #include "asm/types.h"
+#include "fdset.h"
 #include "eventpoll.h"
 #include "proc_parse.h"
 #include "crtools.h"

fifo.c

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 
 #include "crtools.h"
+#include "fdset.h"
 #include "image.h"
 #include "files.h"
 #include "files-reg.h"

file-lock.c

@@ -6,6 +6,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include "fdset.h"
 #include "file-lock.h"
 #include "parasite.h"
 #include "parasite-syscall.h"

files-reg.c

@@ -6,6 +6,7 @@
 #include <sys/stat.h>
 
 #include "crtools.h"
+#include "fdset.h"
 #include "file-ids.h"
 #include "mount.h"
 #include "files.h"

fsnotify.c

@@ -23,6 +23,7 @@
 
 #include "compiler.h"
 #include "asm/types.h"
+#include "fdset.h"
 #include "fsnotify.h"
 #include "proc_parse.h"
 #include "syscall.h"

image.c

 #include <unistd.h>
 #include <stdarg.h>
 #include "crtools.h"
+#include "fdset.h"
 #include "image.h"
 #include "eventpoll.h"
 #include "signalfd.h"

include/crtools.h

@@ -57,7 +57,6 @@ void kill_inventory(void);
 
 extern void print_data(unsigned long addr, unsigned char *data, size_t size);
 extern void print_image_data(int fd, unsigned int length, int show);
-extern struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX];
 
 extern int open_image_dir(void);
 extern void close_image_dir(void);
@@ -70,24 +69,6 @@ void up_page_ids_base(void);
 
 #define LAST_PID_PATH		"/proc/sys/kernel/ns_last_pid"
 
-struct cr_fdset {
-	int fd_off;
-	int fd_nr;
-	int *_fds;
-};
-
-static inline int fdset_fd(const struct cr_fdset *fdset, int type)
-{
-	int idx;
-
-	idx = type - fdset->fd_off;
-	BUG_ON(idx > fdset->fd_nr);
-
-	return fdset->_fds[idx];
-}
-
-extern struct cr_fdset *glob_fdset;
-
 int cr_dump_tasks(pid_t pid);
 int cr_pre_dump_tasks(pid_t pid);
 int cr_restore_tasks(void);
@@ -100,15 +81,6 @@ int cr_exec(int pid, char **opts);
 #define O_SHOW	(O_RDONLY)
 #define O_RSTR	(O_RDONLY)
 
-struct cr_fdset *cr_task_fdset_open(int pid, int mode);
-struct cr_fdset *cr_fdset_open_range(int pid, int from, int to,
-			       unsigned long flags);
-#define cr_fdset_open(pid, type, flags) cr_fdset_open_range(pid, \
-		_CR_FD_##type##_FROM, _CR_FD_##type##_TO, flags)
-struct cr_fdset *cr_glob_fdset_open(int mode);
-
-void close_cr_fdset(struct cr_fdset **cr_fdset);
-
 struct fdt {
 	int			nr;		/* How many tasks share this fd table */
 	pid_t			pid;		/* Who should restore this fd table */

include/fdset.h

+#ifndef __CR_FDSET_H__
+#define __CR_FDSET_H__
+
+#include "image-desc.h"
+#include "bug.h"
+
+struct cr_fdset {
+	int fd_off;
+	int fd_nr;
+	int *_fds;
+};
+
+static inline int fdset_fd(const struct cr_fdset *fdset, int type)
+{
+	int idx;
+
+	idx = type - fdset->fd_off;
+	BUG_ON(idx > fdset->fd_nr);
+
+	return fdset->_fds[idx];
+}
+
+extern struct cr_fdset *glob_fdset;
+
+extern struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX];
+
+struct cr_fdset *cr_task_fdset_open(int pid, int mode);
+struct cr_fdset *cr_fdset_open_range(int pid, int from, int to,
+			       unsigned long flags);
+#define cr_fdset_open(pid, type, flags) cr_fdset_open_range(pid, \
+		_CR_FD_##type##_FROM, _CR_FD_##type##_TO, flags)
+struct cr_fdset *cr_glob_fdset_open(int mode);
+
+void close_cr_fdset(struct cr_fdset **cr_fdset);
+
+#endif

ipc_ns.c

@@ -9,6 +9,7 @@
 
 #include "util.h"
 #include "crtools.h"
+#include "fdset.h"
 #include "syscall.h"
 #include "namespaces.h"
 #include "sysctl.h"

namespaces.c

@@ -3,6 +3,7 @@
 #include <sys/wait.h>
 #include <stdlib.h>
 #include "util.h"
+#include "fdset.h"
 #include "syscall.h"
 #include "uts_ns.h"
 #include "ipc_ns.h"

net.c

@@ -8,6 +8,7 @@
 #include <sched.h>
 #include <sys/mount.h>
 
+#include "fdset.h"
 #include "syscall-types.h"
 #include "namespaces.h"
 #include "net.h"

parasite-syscall.c

@@ -12,6 +12,7 @@
 #include "protobuf/core.pb-c.h"
 #include "protobuf/pagemap.pb-c.h"
 
+#include "fdset.h"
 #include "syscall.h"
 #include "ptrace.h"
 #include "asm/processor-flags.h"

pipes.c

@@ -6,6 +6,7 @@
 #include <sys/mman.h>
 
 #include "crtools.h"
+#include "fdset.h"
 #include "image.h"
 #include "files.h"
 #include "pipes.h"

signalfd.c

@@ -7,6 +7,7 @@
 #include "signalfd.h"
 #include "proc_parse.h"
 #include "crtools.h"
+#include "fdset.h"
 #include "image.h"
 #include "util.h"
 #include "log.h"

sk-inet.c

@@ -12,6 +12,7 @@
 #include "asm/types.h"
 #include "libnetlink.h"
 #include "crtools.h"
+#include "fdset.h"
 #include "inet_diag.h"
 #include "files.h"
 #include "image.h"

sk-netlink.c

@@ -4,6 +4,7 @@
 #include <poll.h>
 
 #include "crtools.h"
+#include "fdset.h"
 #include "files.h"
 #include "sockets.h"
 #include "util.h"

sk-packet.c

@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <string.h>
 #include "asm/types.h"
+#include "fdset.h"
 #include "files.h"
 #include "sockets.h"
 #include "libnetlink.h"

sk-queue.c

@@ -12,6 +12,7 @@
 
 #include "asm/types.h"
 #include "list.h"
+#include "fdset.h"
 #include "image.h"
 #include "crtools.h"
 #include "util.h"

sk-unix.c

@@ -11,6 +11,7 @@
 #include "asm/types.h"
 #include "libnetlink.h"
 #include "crtools.h"
+#include "fdset.h"
 #include "unix_diag.h"
 #include "files.h"
 #include "file-ids.h"

tty.c

@@ -18,6 +18,7 @@
 #include "syscall.h"
 #include "files.h"
 #include "crtools.h"
+#include "fdset.h"
 #include "servicefd.h"
 #include "image.h"
 #include "util.h"

tun.c

@@ -5,6 +5,7 @@
 #include <sys/ioctl.h>
 
 #include "crtools.h"
+#include "fdset.h"
 #include "protobuf.h"
 #include "cr-show.h"
 #include "string.h"