diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-06-17 19:27:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 16:03:56 -0400 |
commit | 665c7741fb63c7ceeb515f1d1ed8b016efe65bf3 (patch) | |
tree | 2c7a06e02d444bb773808c497c680a5b2db7af23 | |
parent | b4188def441197d38f20e0935372780ed7c0e19d (diff) |
ipcns: move free_ipcs() proto
Function is really private to ipc/ and avoid struct kern_ipc_perm
forward declaration.
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>
-rw-r--r-- | include/linux/ipc_namespace.h | 4 | ||||
-rw-r--r-- | ipc/util.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 804e4e4a2b62..e408722a84c7 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
@@ -96,10 +96,6 @@ static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; } | |||
96 | #if defined(CONFIG_IPC_NS) | 96 | #if defined(CONFIG_IPC_NS) |
97 | extern struct ipc_namespace *copy_ipcs(unsigned long flags, | 97 | extern struct ipc_namespace *copy_ipcs(unsigned long flags, |
98 | struct ipc_namespace *ns); | 98 | struct ipc_namespace *ns); |
99 | extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids, | ||
100 | void (*free)(struct ipc_namespace *, | ||
101 | struct kern_ipc_perm *)); | ||
102 | |||
103 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) | 99 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) |
104 | { | 100 | { |
105 | if (ns) | 101 | if (ns) |
diff --git a/ipc/util.h b/ipc/util.h index f9fe90e48861..ab3ebf2621b9 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -171,5 +171,6 @@ static inline void ipc_unlock(struct kern_ipc_perm *perm) | |||
171 | struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id); | 171 | struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id); |
172 | int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, | 172 | int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, |
173 | struct ipc_ops *ops, struct ipc_params *params); | 173 | struct ipc_ops *ops, struct ipc_params *params); |
174 | 174 | void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids, | |
175 | void (*free)(struct ipc_namespace *, struct kern_ipc_perm *)); | ||
175 | #endif | 176 | #endif |