Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40021
b: refs/heads/master
c: e05d722
h: refs/heads/master
i:
  40019: 65448a1
v: v3
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Oct 20, 2006
1 parent fcb773a commit b24be86
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e2a532b26b491706bd8b5c7cfc8d767b43b8f36
refs/heads/master: e05d722e4555cd54677b4c8431d9e81fd047ef7a
6 changes: 2 additions & 4 deletions trunk/kernel/nsproxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
{
struct nsproxy *ns;

ns = kmalloc(sizeof(struct nsproxy), GFP_KERNEL);
if (ns) {
memcpy(ns, orig, sizeof(struct nsproxy));
ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
if (ns)
atomic_set(&ns->count, 1);
}
return ns;
}

Expand Down

0 comments on commit b24be86

Please sign in to comment.