[Devel] Re: [PATCH] containers: define a namespace container subsystem

[Serge E. Hallyn]

Quoting Serge E. Hallyn (serue at us.ibm.com):
> Great.  Note though that I just found a little buglet - the following
> patch is needed for the !CONFIG_CONTAINERS case  :)
> 
> thanks,
> -serge
> 
> Subject: [PATCH] fix !config_containers compile
> 
> when container_switch was changed from returning void to int,
> the !config_containers inline version was not updated.
> 
> Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
> 
> ---
> 
>  include/linux/container.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 6adc0fbab23e7f971750c3eb6c244d1008a636c0
> diff --git a/include/linux/container.h b/include/linux/container.h
> index 15b0446..a9075ac 100644
> --- a/include/linux/container.h
> +++ b/include/linux/container.h
> @@ -222,7 +222,7 @@ static inline void container_exit(struct
> 
>  static inline void container_lock(void) {}
>  static inline void container_unlock(void) {}
> -static inline void container_switch(struct task_struct *tsk) { }
> +static inline int container_switch(struct task_struct *tsk) { }
> 
>  #endif /* !CONFIG_CONTAINERS */

Egads, I blame that one on Friday.  Let's try the following instead...

-serge

Subject: [PATCH] fic !config_containers compile

when container_switch was changed from returning void to int,
the !config_containers inline version was not updated.

Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>

---

 include/linux/container.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

c588c6f4604c80f26b799ebd317726cba8696688
diff --git a/include/linux/container.h b/include/linux/container.h
index 15b0446..294e996 100644
--- a/include/linux/container.h
+++ b/include/linux/container.h
@@ -222,7 +222,7 @@ static inline void container_exit(struct
 
 static inline void container_lock(void) {}
 static inline void container_unlock(void) {}
-static inline void container_switch(struct task_struct *tsk) { }
+static inline int container_switch(struct task_struct *tsk) { return 0; }
 
 #endif /* !CONFIG_CONTAINERS */
 
-- 
1.1.6
_______________________________________________
Containers mailing list
Containers at lists.osdl.org
https://lists.osdl.org/mailman/listinfo/containers