diff options
author | Pierre Peiffer <pierre.peiffer@bull.net> | 2008-02-08 07:18:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:26 -0500 |
commit | ed2ddbf88c0ddeeae4c78bb306a116dfd867c55c (patch) | |
tree | de6d6828c03f98be6fc41e8acf3b3e52df28be9b /include/linux | |
parent | 4b9fcb0ec60584d639ad105c42b75a3447071e47 (diff) |
IPC: make struct ipc_ids static in ipc_namespace
Each ipc_namespace contains a table of 3 pointers to struct ipc_ids (3 for
msg, sem and shm, structure used to store all ipcs) These 'struct ipc_ids'
are dynamically allocated for each icp_namespace as the ipc_namespace
itself (for the init namespace, they are initialized with pointers to
static variables instead)
It is so for historical reason: in fact, before the use of idr to store the
ipcs, the ipcs were stored in tables of variable length, depending of the
maximum number of ipc allowed. Now, these 'struct ipc_ids' have a fixed
size. As they are allocated in any cases for each new ipc_namespace, there
is no gain of memory in having them allocated separately of the struct
ipc_namespace.
This patch proposes to make this table static in the struct ipc_namespace.
Thus, we can allocate all in once and get rid of all the code needed to
allocate and free these ipc_ids separately.
Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net>
Acked-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ipc_namespace.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index a491fc9dd231..6db5522eef51 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
@@ -2,11 +2,20 @@ | |||
2 | #define __IPC_NAMESPACE_H__ | 2 | #define __IPC_NAMESPACE_H__ |
3 | 3 | ||
4 | #include <linux/err.h> | 4 | #include <linux/err.h> |
5 | #include <linux/idr.h> | ||
6 | #include <linux/rwsem.h> | ||
7 | |||
8 | struct ipc_ids { | ||
9 | int in_use; | ||
10 | unsigned short seq; | ||
11 | unsigned short seq_max; | ||
12 | struct rw_semaphore rw_mutex; | ||
13 | struct idr ipcs_idr; | ||
14 | }; | ||
5 | 15 | ||
6 | struct ipc_ids; | ||
7 | struct ipc_namespace { | 16 | struct ipc_namespace { |
8 | struct kref kref; | 17 | struct kref kref; |
9 | struct ipc_ids *ids[3]; | 18 | struct ipc_ids ids[3]; |
10 | 19 | ||
11 | int sem_ctls[4]; | 20 | int sem_ctls[4]; |
12 | int used_sems; | 21 | int used_sems; |