From 5cde8d8d1d942c690e15e3fa6074bf9d3adb0bdd Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 23 Jun 2009 17:29:49 -0400 Subject: [PATCH] --- yaml --- r: 154119 b: refs/heads/master c: 3b22edc5730b87d360ee7dd7143397ba09b73a47 h: refs/heads/master i: 154117: d7efcc304171c6e2a802747a26201479e233e18c 154115: ea052e2391bb2348344630a08880e82c126785b3 154111: 51a4ebf1ce62f2681a7a73c1373fd125a609a339 v: v3 --- [refs] | 2 +- trunk/fs/namespace.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4a6dd34c4ec3..1dc424de2cc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 654f562c526cf9dfb8d453f687341fe0777ee454 +refs/heads/master: 3b22edc5730b87d360ee7dd7143397ba09b73a47 diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index a7bea8c8bd46..4a86b8595164 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -2222,16 +2222,9 @@ static void __init init_mount_tree(void) mnt = do_kern_mount("rootfs", 0, "rootfs", NULL); if (IS_ERR(mnt)) panic("Can't create rootfs"); - ns = kmalloc(sizeof(*ns), GFP_KERNEL); - if (!ns) + ns = create_mnt_ns(mnt); + if (IS_ERR(ns)) panic("Can't allocate initial namespace"); - atomic_set(&ns->count, 1); - INIT_LIST_HEAD(&ns->list); - init_waitqueue_head(&ns->poll); - ns->event = 0; - list_add(&mnt->mnt_list, &ns->list); - ns->root = mnt; - mnt->mnt_ns = ns; init_task.nsproxy->mnt_ns = ns; get_mnt_ns(ns);