From fbb5df292a9ef5ee76fb5f1a1f538a289931cc1a Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 15 Mar 2006 17:37:32 +0100 Subject: [PATCH] --- yaml --- r: 21050 b: refs/heads/master c: f13b83580acef03a36c785dccc534ccdd7e43084 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namespace.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cee1d0d46651..cb617cd0a182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74c002410548c7cb1744b45d17a5fa21da515b63 +refs/heads/master: f13b83580acef03a36c785dccc534ccdd7e43084 diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index 058a44865beb..39c81a8d6316 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -1338,7 +1338,7 @@ struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs) new_ns = kmalloc(sizeof(struct namespace), GFP_KERNEL); if (!new_ns) - goto out; + return NULL; atomic_set(&new_ns->count, 1); INIT_LIST_HEAD(&new_ns->list); @@ -1352,7 +1352,7 @@ struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs) if (!new_ns->root) { up_write(&namespace_sem); kfree(new_ns); - goto out; + return NULL; } spin_lock(&vfsmount_lock); list_add_tail(&new_ns->list, &new_ns->root->mnt_list); @@ -1393,7 +1393,6 @@ struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs) if (altrootmnt) mntput(altrootmnt); -out: return new_ns; }