AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 11:00:56 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG_ON() Conversion in ipc/shm.c

Browse Source 
this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Eric Sesterhenn 2006-04-02 13:42:42 +02:00 committed by Adrian Bunk
parent 7ec7073809
commit 9ba025f108
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipc/shm.c
View File

@ -91,8 +91,8 @@ static inline int shm_addid(struct shmid_kernel *shp)
static inline void shm_inc (int id) { static inline void shm_inc (int id) {
struct shmid_kernel *shp; struct shmid_kernel *shp;
if(!(shp = shm_lock(id))) shp = shm_lock(id);
BUG(); BUG_ON(!shp);
shp->shm_atim = get_seconds(); shp->shm_atim = get_seconds();
shp->shm_lprid = current->tgid; shp->shm_lprid = current->tgid;
shp->shm_nattch++; shp->shm_nattch++;
@ -142,8 +142,8 @@ static void shm_close (struct vm_area_struct *shmd)
mutex_lock(&shm_ids.mutex); mutex_lock(&shm_ids.mutex);
/* remove from the list of attaches of the shm segment */ /* remove from the list of attaches of the shm segment */
if(!(shp = shm_lock(id))) shp = shm_lock(id);
BUG(); BUG_ON(!shp);
shp->shm_lprid = current->tgid; shp->shm_lprid = current->tgid;
shp->shm_dtim = get_seconds(); shp->shm_dtim = get_seconds();
shp->shm_nattch--; shp->shm_nattch--;
@ -283,8 +283,7 @@ asmlinkage long sys_shmget (key_t key, size_t size, int shmflg)
err = -EEXIST; err = -EEXIST;
} else { } else {
shp = shm_lock(id); shp = shm_lock(id);
if(shp==NULL) BUG_ON(shp==NULL);
BUG();
if (shp->shm_segsz < size) if (shp->shm_segsz < size)
err = -EINVAL; err = -EINVAL;
else if (ipcperms(&shp->shm_perm, shmflg)) 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); up_write(&current->mm->mmap_sem);
mutex_lock(&shm_ids.mutex); mutex_lock(&shm_ids.mutex);
if(!(shp = shm_lock(shmid))) shp = shm_lock(shmid);
BUG(); BUG_ON(!shp);
shp->shm_nattch--; shp->shm_nattch--;
if(shp->shm_nattch == 0 && if(shp->shm_nattch == 0 &&
shp->shm_perm.mode & SHM_DEST) shp->shm_perm.mode & SHM_DEST)