diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-25 15:59:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-25 15:59:55 +1100 |
| commit | 712d949b79430782b6a1e1c0f221e4822dc6b17d (patch) | |
| tree | fa06a3fce92804f76e233d20e0ad5610297ba54f /kernel | |
| parent | c8fb5471330b0e96b4debe7de26496e86dafb540 (diff) | |
| parent | 76b5efb35f163567d24cb05cfc4be5d1cb90008e (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/user_namespace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 076c7c8215b0..b2d70d38dff4 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -54,8 +54,8 @@ int create_user_ns(struct cred *new) #endif /* tgcred will be cleared in our caller bc CLONE_THREAD won't be set */ - /* alloc_uid() incremented the userns refcount. Just set it to 1 */ - kref_set(&ns->kref, 1); + /* root_user holds a reference to ns, our reference can be dropped */ + put_user_ns(ns); return 0; } |