Commit 27315c96 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

BUG_ON() Conversion in ipc/sem.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 309be53d

ipc/sem.c

+2 −4
Original line number Diff line number Diff line
@@ -227,8 +227,7 @@ asmlinkage long sys_semget (key_t key, int nsems, int semflg) 
		err = -EEXIST;

	} else {

		sma = sem_lock(id);

		if(sma==NULL)

			BUG();

		BUG_ON(sma==NULL);

		if (nsems > sma->sem_nsems)

			err = -EINVAL;

		else if (ipcperms(&sma->sem_perm, semflg))
@@ -1181,8 +1180,7 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops, 


	sma = sem_lock(semid);

	if(sma==NULL) {

		if(queue.prev != NULL)

			BUG();

		BUG_ON(queue.prev != NULL);

		error = -EIDRM;

		goto out_free;

	}