BUG_ON() Conversion in ipc/util.c

this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
josf · Mar 31, 2006 · 9bc98fc · 9bc98fc
1 parent 99cee0c
commit 9bc98fc
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/ipc/util.c b/ipc/util.c
@@ -266,17 +266,15 @@ struct kern_ipc_perm* ipc_rmid(struct ipc_ids* ids, int id)
 {
 	struct kern_ipc_perm* p;
 	int lid = id % SEQ_MULTIPLIER;
-	if(lid >= ids->entries->size)
-		BUG();
+	BUG_ON(lid >= ids->entries->size);
 
 	/* 
 	 * do not need a rcu_dereference()() here to force ordering
 	 * on Alpha, since the ipc_ids.mutex is held.
 	 */	
 	p = ids->entries->p[lid];
 	ids->entries->p[lid] = NULL;
-	if(p==NULL)
-		BUG();
+	BUG_ON(p==NULL);
 	ids->in_use--;
 
 	if (lid == ids->max_id) {