diff options
author | Nadia Derbey <Nadia.Derbey@bull.net> | 2007-10-19 02:40:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:47 -0400 |
commit | 28028313134e9f11e49f74a4beaa47c91e5ebf06 (patch) | |
tree | adf36a3b40c5cb48ff5bd8803fc10530bac65450 /ipc/util.h | |
parent | ce621f5ba52f30dd59aef4fb50276faee04ef9cf (diff) |
ipc: inline ipc_buildid()
This is a trivial patch that changes the ipc_buildid() routine into a static
inline.
Signed-off-by: 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 'ipc/util.h')
-rw-r--r-- | ipc/util.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ipc/util.h b/ipc/util.h index fa7e7a07486e..76f8a79902de 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -107,7 +107,6 @@ void ipc_rcu_getref(void *ptr); | |||
107 | void ipc_rcu_putref(void *ptr); | 107 | void ipc_rcu_putref(void *ptr); |
108 | 108 | ||
109 | struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int); | 109 | struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int); |
110 | int ipc_buildid(struct ipc_ids* ids, int id, int seq); | ||
111 | 110 | ||
112 | void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); | 111 | void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); |
113 | void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); | 112 | void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); |
@@ -127,6 +126,11 @@ extern int ipcget_new(struct ipc_namespace *, struct ipc_ids *, | |||
127 | extern int ipcget_public(struct ipc_namespace *, struct ipc_ids *, | 126 | extern int ipcget_public(struct ipc_namespace *, struct ipc_ids *, |
128 | struct ipc_ops *, struct ipc_params *); | 127 | struct ipc_ops *, struct ipc_params *); |
129 | 128 | ||
129 | static inline int ipc_buildid(struct ipc_ids *ids, int id, int seq) | ||
130 | { | ||
131 | return SEQ_MULTIPLIER * seq + id; | ||
132 | } | ||
133 | |||
130 | static inline int ipc_checkid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp, | 134 | static inline int ipc_checkid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp, |
131 | int uid) | 135 | int uid) |
132 | { | 136 | { |