2013-03-05 09:36:04

by Davidlohr Bueso

[permalink] [raw]
Subject: [PATCH v2 1/4] ipc: remove bogus lock comment for ipc_checkid

There is no reason to be holding the ipc lock while
reading ipcp->seq, hence remove misleading comment.

Also simplify the return value for the function.

Signed-off-by: Davidlohr Bueso <[email protected]>
---
ipc/util.h | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ipc/util.h b/ipc/util.h
index eeb79a1..ac1480a 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -150,14 +150,9 @@ static inline int ipc_buildid(int id, int seq)
return SEQ_MULTIPLIER * seq + id;
}

-/*
- * Must be called with ipcp locked
- */
static inline int ipc_checkid(struct kern_ipc_perm *ipcp, int uid)
{
- if (uid / SEQ_MULTIPLIER != ipcp->seq)
- return 1;
- return 0;
+ return uid / SEQ_MULTIPLIER != ipcp->seq;
}

static inline void ipc_lock_by_ptr(struct kern_ipc_perm *perm)
--
1.7.11.7