From ce25915343b1e66593ff69d1f27ecbec70c83ee8 Mon Sep 17 00:00:00 2001 From: "Serge E. Hallyn" Date: Tue, 17 Jul 2007 15:28:17 -0400 Subject: [PATCH] --- yaml --- r: 61767 b: refs/heads/master c: 626ac545c12e5f9bffe93086d1d03d26c99987ea h: refs/heads/master i: 61765: 2b5ca582bff950a66999fc5650e2a352e9c20384 61763: f7626de1336a7398f208bd8fa3013476f238f1d1 61759: 65300125f500883d507f50c9c7e64bb9033562b2 v: v3 --- [refs] | 2 +- trunk/include/linux/user_namespace.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5ed339450fdd..f142122e5721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9550b105b8646f916862aee3ab7b25020ca14159 +refs/heads/master: 626ac545c12e5f9bffe93086d1d03d26c99987ea diff --git a/trunk/include/linux/user_namespace.h b/trunk/include/linux/user_namespace.h index bb320573bb9e..1101b0ce878f 100644 --- a/trunk/include/linux/user_namespace.h +++ b/trunk/include/linux/user_namespace.h @@ -49,7 +49,7 @@ static inline struct user_namespace *copy_user_ns(int flags, if (flags & CLONE_NEWUSER) return ERR_PTR(-EINVAL); - return NULL; + return old_ns; } static inline void put_user_ns(struct user_namespace *ns)