namespaces: mqueue ns: move mqueue_mnt into struct ipc_namespace
Move mqueue vfsmount plus a few tunables into the ipc_namespace struct. The CONFIG_IPC_NS boolean and the ipc_namespace struct will serve both the posix message queue namespaces and the SYSV ipc namespaces. The sysctl code will be fixed separately in patch 3. After just this patch, making a change to posix mqueue tunables always changes the values in the initial ipc namespace. Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
909e6d9479
commit
614b84cf4e
@@ -13,10 +13,32 @@
|
||||
#include <linux/security.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/ipc.h>
|
||||
#include <linux/ipc_namespace.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#include "util.h"
|
||||
|
||||
/*
|
||||
* The next 2 defines are here bc this is the only file
|
||||
* compiled when either CONFIG_SYSVIPC and CONFIG_POSIX_MQUEUE
|
||||
* and not CONFIG_IPC_NS.
|
||||
*/
|
||||
struct ipc_namespace init_ipc_ns = {
|
||||
.kref = {
|
||||
/* It's not for this patch to change, but should this be 1? */
|
||||
.refcount = ATOMIC_INIT(2),
|
||||
},
|
||||
#ifdef CONFIG_POSIX_MQUEUE
|
||||
.mq_mnt = NULL,
|
||||
.mq_queues_count = 0,
|
||||
.mq_queues_max = DFLT_QUEUESMAX,
|
||||
.mq_msg_max = DFLT_MSGMAX,
|
||||
.mq_msgsize_max = DFLT_MSGSIZEMAX,
|
||||
#endif
|
||||
};
|
||||
|
||||
atomic_t nr_ipc_ns = ATOMIC_INIT(1);
|
||||
|
||||
struct msg_msgseg {
|
||||
struct msg_msgseg* next;
|
||||
/* the next part of the message follows immediately */
|
||||
|
Reference in New Issue
Block a user