diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-06-17 19:27:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 16:03:55 -0400 |
| commit | 4c2a7e72d5937c6a112141c7ff3df0727b3cf3df (patch) | |
| tree | 783dc576aef932a3b56c62da2edb63c1bf9b1170 | |
| parent | dca4a979604da1bac6956c0117abc2114d6dd3ec (diff) | |
utsns: extract creeate_uts_ns()
create_uts_ns() will be used by C/R to create fresh uts_ns.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/utsname.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kernel/utsname.c b/kernel/utsname.c index 815237a55af8..8a82b4b8ea52 100644 --- a/kernel/utsname.c +++ b/kernel/utsname.c | |||
| @@ -15,6 +15,16 @@ | |||
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | 17 | ||
| 18 | static struct uts_namespace *create_uts_ns(void) | ||
| 19 | { | ||
| 20 | struct uts_namespace *uts_ns; | ||
| 21 | |||
| 22 | uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL); | ||
| 23 | if (uts_ns) | ||
| 24 | kref_init(&uts_ns->kref); | ||
| 25 | return uts_ns; | ||
| 26 | } | ||
| 27 | |||
| 18 | /* | 28 | /* |
| 19 | * Clone a new ns copying an original utsname, setting refcount to 1 | 29 | * Clone a new ns copying an original utsname, setting refcount to 1 |
| 20 | * @old_ns: namespace to clone | 30 | * @old_ns: namespace to clone |
| @@ -24,14 +34,13 @@ static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns) | |||
| 24 | { | 34 | { |
| 25 | struct uts_namespace *ns; | 35 | struct uts_namespace *ns; |
| 26 | 36 | ||
| 27 | ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL); | 37 | ns = create_uts_ns(); |
| 28 | if (!ns) | 38 | if (!ns) |
| 29 | return ERR_PTR(-ENOMEM); | 39 | return ERR_PTR(-ENOMEM); |
| 30 | 40 | ||
| 31 | down_read(&uts_sem); | 41 | down_read(&uts_sem); |
| 32 | memcpy(&ns->name, &old_ns->name, sizeof(ns->name)); | 42 | memcpy(&ns->name, &old_ns->name, sizeof(ns->name)); |
| 33 | up_read(&uts_sem); | 43 | up_read(&uts_sem); |
| 34 | kref_init(&ns->kref); | ||
| 35 | return ns; | 44 | return ns; |
| 36 | } | 45 | } |
| 37 | 46 | ||
