aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2009-06-17 19:27:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 16:03:56 -0400
commitb4188def441197d38f20e0935372780ed7c0e19d (patch)
tree483d47961a7c18a9d15f81cb8690f66feeb566bc /ipc
parent90af90d7d3a7411db64860c9d6e5798ff87cad08 (diff)
ipcns: make free_ipc_ns() static
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/namespace.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/ipc/namespace.c b/ipc/namespace.c
index 231ee5359ab..a1094ff0bef 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -83,6 +83,30 @@ void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
83 up_write(&ids->rw_mutex); 83 up_write(&ids->rw_mutex);
84} 84}
85 85
86static void free_ipc_ns(struct ipc_namespace *ns)
87{
88 /*
89 * Unregistering the hotplug notifier at the beginning guarantees
90 * that the ipc namespace won't be freed while we are inside the
91 * callback routine. Since the blocking_notifier_chain_XXX routines
92 * hold a rw lock on the notifier list, unregister_ipcns_notifier()
93 * won't take the rw lock before blocking_notifier_call_chain() has
94 * released the rd lock.
95 */
96 unregister_ipcns_notifier(ns);
97 sem_exit_ns(ns);
98 msg_exit_ns(ns);
99 shm_exit_ns(ns);
100 kfree(ns);
101 atomic_dec(&nr_ipc_ns);
102
103 /*
104 * Do the ipcns removal notification after decrementing nr_ipc_ns in
105 * order to have a correct value when recomputing msgmni.
106 */
107 ipcns_notify(IPCNS_REMOVED);
108}
109
86/* 110/*
87 * put_ipc_ns - drop a reference to an ipc namespace. 111 * put_ipc_ns - drop a reference to an ipc namespace.
88 * @ns: the namespace to put 112 * @ns: the namespace to put
@@ -108,27 +132,3 @@ void put_ipc_ns(struct ipc_namespace *ns)
108 free_ipc_ns(ns); 132 free_ipc_ns(ns);
109 } 133 }
110} 134}
111
112void free_ipc_ns(struct ipc_namespace *ns)
113{
114 /*
115 * Unregistering the hotplug notifier at the beginning guarantees
116 * that the ipc namespace won't be freed while we are inside the
117 * callback routine. Since the blocking_notifier_chain_XXX routines
118 * hold a rw lock on the notifier list, unregister_ipcns_notifier()
119 * won't take the rw lock before blocking_notifier_call_chain() has
120 * released the rd lock.
121 */
122 unregister_ipcns_notifier(ns);
123 sem_exit_ns(ns);
124 msg_exit_ns(ns);
125 shm_exit_ns(ns);
126 kfree(ns);
127 atomic_dec(&nr_ipc_ns);
128
129 /*
130 * Do the ipcns removal notification after decrementing nr_ipc_ns in
131 * order to have a correct value when recomputing msgmni.
132 */
133 ipcns_notify(IPCNS_REMOVED);
134}