[CRIU] [PATCH 3/8] files: Rename prepare_fs into restore_fs

Pavel Emelyanov xemul at parallels.com
Thu Jul 3 08:07:29 PDT 2014


Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 cr-restore.c    | 2 +-
 files.c         | 2 +-
 include/files.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-restore.c b/cr-restore.c
index 7d43aab..92a617a 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -2679,7 +2679,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
 	 * attempts to open files by paths above (e.g. /proc).
 	 */
 
-	if (prepare_fs(pid))
+	if (restore_fs(pid))
 		goto err;
 
 	close_image_dir();
diff --git a/files.c b/files.c
index 18d0f97..2ccc5d1 100644
--- a/files.c
+++ b/files.c
@@ -1018,7 +1018,7 @@ static int fchroot(int fd)
 	return chroot(fd_path);
 }
 
-int prepare_fs(int pid)
+int restore_fs(int pid)
 {
 	int ifd, dd_root, dd_cwd, ret, err = -1;
 	FsEntry *fe;
diff --git a/include/files.h b/include/files.h
index a18d56e..e63a998 100644
--- a/include/files.h
+++ b/include/files.h
@@ -148,7 +148,7 @@ extern int prepare_fd_pid(struct pstree_item *me);
 extern int prepare_ctl_tty(int pid, struct rst_info *rst_info, u32 ctl_tty_id);
 extern int prepare_shared_fdinfo(void);
 extern int get_filemap_fd(struct vma_area *);
-extern int prepare_fs(int pid);
+extern int restore_fs(int pid);
 extern int set_fd_flags(int fd, int flags);
 
 extern int close_old_fds(struct pstree_item *me);
-- 
1.8.3.1




More information about the CRIU mailing list