Commit 4ffa7969 authored by Pavel Emelyanov's avatar Pavel Emelyanov

mnt: Remove unneeded argument from prepare_mnt_ns

Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent bc312d32
...@@ -15,7 +15,7 @@ struct cr_fdset; ...@@ -15,7 +15,7 @@ struct cr_fdset;
struct ns_id; struct ns_id;
extern struct mount_info * collect_mntinfo(struct ns_id *ns); extern struct mount_info * collect_mntinfo(struct ns_id *ns);
extern int dump_mnt_ns(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); extern int pivot_root(const char *new_root, const char *put_old);
......
...@@ -1659,7 +1659,7 @@ static int prepare_roots_yard(void) ...@@ -1659,7 +1659,7 @@ static int prepare_roots_yard(void)
return 0; 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 mount_info *pms;
struct ns_id *nsid; struct ns_id *nsid;
...@@ -1713,7 +1713,7 @@ int fini_mnt_ns() ...@@ -1713,7 +1713,7 @@ int fini_mnt_ns()
return ret; return ret;
} }
int prepare_mnt_ns(int ns_pid) int prepare_mnt_ns(void)
{ {
int ret = -1; int ret = -1;
struct mount_info *mis, *old; struct mount_info *mis, *old;
...@@ -1772,7 +1772,7 @@ int prepare_mnt_ns(int ns_pid) ...@@ -1772,7 +1772,7 @@ int prepare_mnt_ns(int ns_pid)
free_mntinfo(old); free_mntinfo(old);
ret = populate_mnt_ns(ns_pid, mis); ret = populate_mnt_ns(mis);
if (ret) if (ret)
goto out; goto out;
......
...@@ -527,7 +527,7 @@ int prepare_namespace(struct pstree_item *item, unsigned long clone_flags) ...@@ -527,7 +527,7 @@ int prepare_namespace(struct pstree_item *item, unsigned long clone_flags)
if ((clone_flags & CLONE_NEWIPC) && prepare_ipc_ns(id)) if ((clone_flags & CLONE_NEWIPC) && prepare_ipc_ns(id))
return -1; return -1;
id = ns_per_id ? item->ids->mnt_ns_id : pid; 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 -1;
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment