Merge branch 'master'

2 files changed, 9 insertions, 12 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index f806a2e314e0..6b0c9af5bbf7 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -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 @@ invalid:
         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)
diff --git a/ipc/util.c b/ipc/util.c
index 23151ef32590..5e785a29e1e6 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -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) {