Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6] / ipc / msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index fbf757064a328a11ea100b2975a6ef180430502c..60c1e5c23418116326fdd36bd05c5b65cd93643c 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -220,8 +220,7 @@ asmlinkage long sys_msgget (key_t key, int msgflg)
                ret = -EEXIST;
        } else {
                msq = msg_lock(id);
-               if(msq==NULL)
-                       BUG();
+               BUG_ON(msq==NULL);
                if (ipcperms(&msq->q_perm, msgflg))
                        ret = -EACCES;
                else {