aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNadia Derbey <Nadia.Derbey@bull.net>2008-04-29 04:00:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:12 -0400
commite2c284d8a87f95df9b47c6a13168a844ca7c03e9 (patch)
tree6eb27ea254d47c94dbfb33da23314dd69479e56e /include
parent424450c1dbe72b6e2637e91108417d7d9580c4c3 (diff)
ipc: recompute msgmni on ipc namespace creation/removal
Introduce a notification mechanism that aims at recomputing msgmni each time an ipc namespace is created or removed. The ipc namespace notifier chain already defined for memory hotplug management is used for that purpose too. Each time a new ipc namespace is allocated or an existing ipc namespace is removed, the ipcns notifier chain is notified. The callback routine for each registered ipc namespace is then activated in order to recompute msgmni for that namespace. Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net> Cc: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Matt Helsley <matthltc@us.ibm.com> Cc: Mingming Cao <cmm@us.ibm.com> Cc: Pierre Peiffer <pierre.peiffer@bull.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ipc_namespace.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index cfb2a08b28f5..c3b1da9e5feb 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -4,14 +4,14 @@
4#include <linux/err.h> 4#include <linux/err.h>
5#include <linux/idr.h> 5#include <linux/idr.h>
6#include <linux/rwsem.h> 6#include <linux/rwsem.h>
7#ifdef CONFIG_MEMORY_HOTPLUG
8#include <linux/notifier.h> 7#include <linux/notifier.h>
9#endif /* CONFIG_MEMORY_HOTPLUG */
10 8
11/* 9/*
12 * ipc namespace events 10 * ipc namespace events
13 */ 11 */
14#define IPCNS_MEMCHANGED 0x00000001 /* Notify lowmem size changed */ 12#define IPCNS_MEMCHANGED 0x00000001 /* Notify lowmem size changed */
13#define IPCNS_CREATED 0x00000002 /* Notify new ipc namespace created */
14#define IPCNS_REMOVED 0x00000003 /* Notify ipc namespace removed */
15 15
16#define IPCNS_CALLBACK_PRI 0 16#define IPCNS_CALLBACK_PRI 0
17 17
@@ -42,9 +42,7 @@ struct ipc_namespace {
42 int shm_ctlmni; 42 int shm_ctlmni;
43 int shm_tot; 43 int shm_tot;
44 44
45#ifdef CONFIG_MEMORY_HOTPLUG
46 struct notifier_block ipcns_nb; 45 struct notifier_block ipcns_nb;
47#endif
48}; 46};
49 47
50extern struct ipc_namespace init_ipc_ns; 48extern struct ipc_namespace init_ipc_ns;
@@ -53,29 +51,10 @@ extern atomic_t nr_ipc_ns;
53#ifdef CONFIG_SYSVIPC 51#ifdef CONFIG_SYSVIPC
54#define INIT_IPC_NS(ns) .ns = &init_ipc_ns, 52#define INIT_IPC_NS(ns) .ns = &init_ipc_ns,
55 53
56#ifdef CONFIG_MEMORY_HOTPLUG
57
58extern int register_ipcns_notifier(struct ipc_namespace *); 54extern int register_ipcns_notifier(struct ipc_namespace *);
59extern int unregister_ipcns_notifier(struct ipc_namespace *); 55extern int unregister_ipcns_notifier(struct ipc_namespace *);
60extern int ipcns_notify(unsigned long); 56extern int ipcns_notify(unsigned long);
61 57
62#else /* CONFIG_MEMORY_HOTPLUG */
63
64static inline int register_ipcns_notifier(struct ipc_namespace *ipcns)
65{
66 return 0;
67}
68static inline int unregister_ipcns_notifier(struct ipc_namespace *ipcns)
69{
70 return 0;
71}
72static inline int ipcns_notify(unsigned long ev)
73{
74 return 0;
75}
76
77#endif /* CONFIG_MEMORY_HOTPLUG */
78
79#else /* CONFIG_SYSVIPC */ 58#else /* CONFIG_SYSVIPC */
80#define INIT_IPC_NS(ns) 59#define INIT_IPC_NS(ns)
81#endif /* CONFIG_SYSVIPC */ 60#endif /* CONFIG_SYSVIPC */