mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 23:35:21 +00:00
Code Issues Releases Wiki Activity

mnt: Remove unneeded argument from prepare_mnt_ns

Browse Source 
Acked-by: Andrew Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2014-04-22 20:35:43 +04:00
parent bc312d3229
commit 4ffa79695d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mount.h
View File

@@ -15,7 +15,7 @@ struct cr_fdset;
struct ns_id;
extern struct mount_info * collect_mntinfo(struct ns_id *ns);
extern int dump_mnt_ns(struct ns_id *ns);
extern int prepare_mnt_ns(int pid);
extern int prepare_mnt_ns(void);
extern int pivot_root(const char *new_root, const char *put_old);

6
mount.c
View File

@@ -1659,7 +1659,7 @@ static int prepare_roots_yard(void)
return 0;
}
static int populate_mnt_ns(int ns_pid, struct mount_info *mis)
static int populate_mnt_ns(struct mount_info *mis)
{
struct mount_info *pms;
struct ns_id *nsid;
@@ -1713,7 +1713,7 @@ int fini_mnt_ns()
return ret;
}
int prepare_mnt_ns(int ns_pid)
int prepare_mnt_ns(void)
{
int ret = -1;
struct mount_info *mis, *old;
@@ -1772,7 +1772,7 @@ int prepare_mnt_ns(int ns_pid)
free_mntinfo(old);
ret = populate_mnt_ns(ns_pid, mis);
ret = populate_mnt_ns(mis);
if (ret)
goto out;

2
namespaces.c
View File

@@ -527,7 +527,7 @@ int prepare_namespace(struct pstree_item *item, unsigned long clone_flags)
if ((clone_flags & CLONE_NEWIPC) && prepare_ipc_ns(id))
return -1;
id = ns_per_id ? item->ids->mnt_ns_id : pid;
if ((clone_flags & CLONE_NEWNS) && prepare_mnt_ns(id))
if ((clone_flags & CLONE_NEWNS) && prepare_mnt_ns())
return -1;
return 0;