[PATCH 7/9] add a user namespace owner of ipc ns

[Andrew Morton]

On Thu, 17 Feb 2011 15:03:49 +0000
"Serge E. Hallyn" <serge at hallyn.com> wrote:

>
> ...
>
> --- a/include/linux/ipc_namespace.h
> +++ b/include/linux/ipc_namespace.h
> @@ -24,6 +24,7 @@ struct ipc_ids {
>  	struct idr ipcs_idr;
>  };
>  
> +struct user_namespace;

Move to top of file.

>  struct ipc_namespace {
>  	atomic_t	count;
>  	struct ipc_ids	ids[3];
> @@ -56,6 +57,8 @@ struct ipc_namespace {
>  	unsigned int    mq_msg_max;      /* initialized to DFLT_MSGMAX */
>  	unsigned int    mq_msgsize_max;  /* initialized to DFLT_MSGSIZEMAX */
>  
> +	/* user_ns which owns the ipc ns */
> +	struct user_namespace *user_ns;
>  };
>  
>  extern struct ipc_namespace init_ipc_ns;
> diff --git a/ipc/msgutil.c b/ipc/msgutil.c
> index f095ee2..d91ff4b 100644
> --- a/ipc/msgutil.c
> +++ b/ipc/msgutil.c
> @@ -20,6 +20,8 @@
>  
>  DEFINE_SPINLOCK(mq_lock);
>  
> +extern struct user_namespace init_user_ns;

Should be declared in .h, not in .c.

>  /*
>   * The next 2 defines are here bc this is the only file
>   * compiled when either CONFIG_SYSVIPC and CONFIG_POSIX_MQUEUE
>
> ...
>