summaryrefslogtreecommitdiffstats
path: root/ipc/util.h
diff options
context:
space:
mode:
authorNadia Derbey <Nadia.Derbey@bull.net>2007-10-18 23:40:55 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 11:53:48 -0700
commit1b531f213661657d6e1c55cf5c97f649d630c227 (patch)
tree0e03a4f286a12b383b9de455c0f39946df867fb7 /ipc/util.h
parent3e148c79938aa39035669c1cfa3ff60722134535 (diff)
downloadlinux-1b531f213661657d6e1c55cf5c97f649d630c227.tar.bz2
ipc: remove unneeded parameters
Remvoe the unneeded parameters from ipc_checkid() and ipc_buildid() interfaces. 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.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/ipc/util.h b/ipc/util.h
index bd47687077e0..9ffea40457ce 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -134,7 +134,7 @@ extern int ipcget_new(struct ipc_namespace *, struct ipc_ids *,
extern int ipcget_public(struct ipc_namespace *, struct ipc_ids *,
struct ipc_ops *, struct ipc_params *);
-static inline int ipc_buildid(struct ipc_ids *ids, int id, int seq)
+static inline int ipc_buildid(int id, int seq)
{
return SEQ_MULTIPLIER * seq + id;
}
@@ -142,8 +142,7 @@ static inline int ipc_buildid(struct ipc_ids *ids, int id, int seq)
/*
* Must be called with ipcp locked
*/
-static inline int ipc_checkid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp,
- int uid)
+static inline int ipc_checkid(struct kern_ipc_perm *ipcp, int uid)
{
if (uid / SEQ_MULTIPLIER != ipcp->seq)
return 1;
@@ -171,7 +170,7 @@ static inline struct kern_ipc_perm *ipc_lock_check_down(struct ipc_ids *ids,
if (IS_ERR(out))
return out;
- if (ipc_checkid(ids, out, id)) {
+ if (ipc_checkid(out, id)) {
ipc_unlock(out);
return ERR_PTR(-EIDRM);
}
@@ -188,7 +187,7 @@ static inline struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids,
if (IS_ERR(out))
return out;
- if (ipc_checkid(ids, out, id)) {
+ if (ipc_checkid(out, id)) {
ipc_unlock(out);
return ERR_PTR(-EIDRM);
}