From cb74aa3e485bd4df6f51a4b61f33c13c89c5762e Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Fri, 22 Jun 2012 16:24:00 +0400 Subject: [PATCH] files: Drop redundant declarations from files.h These are declared in files-reg.h, so get rid of them and add files-reg.h inclusion where needed. Signed-off-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov --- cr-restore.c | 1 + files.c | 1 + include/files.h | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cr-restore.c b/cr-restore.c index 74c844196..79dadac0b 100644 --- a/cr-restore.c +++ b/cr-restore.c @@ -34,6 +34,7 @@ #include "sockets.h" #include "lock.h" #include "files.h" +#include "files-reg.h" #include "pipes.h" #include "sk-inet.h" #include "eventfd.h" diff --git a/files.c b/files.c index d993df271..6398d1a43 100644 --- a/files.c +++ b/files.c @@ -15,6 +15,7 @@ #include "crtools.h" #include "files.h" +#include "files-reg.h" #include "image.h" #include "list.h" #include "util.h" diff --git a/include/files.h b/include/files.h index 62db20546..5e6f10e34 100644 --- a/include/files.h +++ b/include/files.h @@ -68,7 +68,6 @@ extern int restore_fown(int fd, fown_t *fown); int rst_file_params(int fd, fown_t *fown, int flags); void show_saved_files(void); -extern int collect_reg_files(void); struct pstree_item; extern int prepare_fds(struct pstree_item *); struct rst_info; @@ -76,11 +75,8 @@ extern int prepare_fd_pid(int pid, struct rst_info *); extern int prepare_shared_fdinfo(void); extern int get_filemap_fd(int pid, struct vma_entry *vma_entry); extern int prepare_fs(int pid); -extern int open_reg_by_id(u32 id); int set_fd_flags(int fd, int flags); extern int self_exe_fd; -void clear_ghost_files(void); - #endif /* FILES_H_ */