projects/linux·commit 665c7741

ipcns: move free_ipcs() proto

665c7741 · Alexey Dobriyan <[email protected]> · 2009-06-17 16:27:57 -07:00

Function is really private to ipc/ and avoid struct kern_ipc_perm
forward declaration.

Signed-off-by: Alexey Dobriyan <[email protected]>
Reviewed-by: WANG Cong <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
665c7741fb63c7ceeb515f1d1ed8b016efe65bf3
Parents
b4188def

Changes

2 files changed · +2 −5

FileStatusAddDelContent
include/linux/ipc_namespace.hmodified+0−4View file
ipc/util.hmodified+2−1View file

include/linux/ipc_namespace.h

View file
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index 804e4e4..e408722 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; }
#if defined(CONFIG_IPC_NS)
extern struct ipc_namespace *copy_ipcs(unsigned long flags,
struct ipc_namespace *ns);
-extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
- void (*free)(struct ipc_namespace *,
- struct kern_ipc_perm *));
-
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
{
if (ns)

ipc/util.h

View file
diff --git a/ipc/util.h b/ipc/util.h
index f9fe90e..ab3ebf2 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -171,5 +171,6 @@ static inline void ipc_unlock(struct kern_ipc_perm *perm)
struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id);
int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids,
struct ipc_ops *ops, struct ipc_params *params);
-
+void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
+ void (*free)(struct ipc_namespace *, struct kern_ipc_perm *));
#endif