Commit 9bc98fc6 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

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: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 99cee0cd

ipc/util.c

+2 −4
Original line number Diff line number Diff line
@@ -266,8 +266,7 @@ 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
@@ -275,8 +274,7 @@ struct kern_ipc_perm* ipc_rmid(struct ipc_ids* ids, int id) 
	 */	

	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) {