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

BUG_ON() Conversion in ipc/shm.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 7ec70738

ipc/shm.c

+7 −8
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static inline int shm_addid(struct shmid_kernel *shp) 
static inline void shm_inc (int id) {

	struct shmid_kernel *shp;



	if(!(shp = shm_lock(id)))

		BUG();

	shp = shm_lock(id);

	BUG_ON(!shp);

	shp->shm_atim = get_seconds();

	shp->shm_lprid = current->tgid;

	shp->shm_nattch++;
@@ -142,8 +142,8 @@ static void shm_close (struct vm_area_struct *shmd) 


	mutex_lock(&shm_ids.mutex);

	/* remove from the list of attaches of the shm segment */

	if(!(shp = shm_lock(id)))

		BUG();

	shp = shm_lock(id);

	BUG_ON(!shp);

	shp->shm_lprid = current->tgid;

	shp->shm_dtim = get_seconds();

	shp->shm_nattch--;
@@ -283,8 +283,7 @@ asmlinkage long sys_shmget (key_t key, size_t size, int shmflg) 
		err = -EEXIST;

	} else {

		shp = shm_lock(id);

		if(shp==NULL)

			BUG();

		BUG_ON(shp==NULL);

		if (shp->shm_segsz < size)

			err = -EINVAL;

		else if (ipcperms(&shp->shm_perm, shmflg))
@@ -774,8 +773,8 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) 
	up_write(&current->mm->mmap_sem);



	mutex_lock(&shm_ids.mutex);

	if(!(shp = shm_lock(shmid)))

		BUG();

	shp = shm_lock(shmid);

	BUG_ON(!shp);

	shp->shm_nattch--;

	if(shp->shm_nattch == 0 &&

	   shp->shm_perm.mode & SHM_DEST)