---

yaml --- r: 25194 b: refs/heads/master c: 9bc98fc h: refs/heads/master v: v3
git-mirror · Mar 31, 2006 · ebcda31 · ebcda31
1 parent 70e6696
commit ebcda31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99cee0cd7560fc4e7f3646ee18d90e328bd1cb32
+refs/heads/master: 9bc98fc6fd3d07f37b597601489df200e0024222
diff --git a/trunk/ipc/util.c b/trunk/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) {