Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[sfrench/cifs-2.6.git] / ipc / msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index ccf5f495db7b851cb4ae92d40acad93919b25a49..fdf3db5731ce8df2cfd038f40c69710243d85338 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -203,10 +203,10 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
         * ipc_addid() locks msq
         */
        id = ipc_addid(&msg_ids(ns), &msq->q_perm, ns->msg_ctlmni);
-       if (id == -1) {
+       if (id < 0) {
                security_msg_queue_free(msq);
                ipc_rcu_putref(msq);
-               return -ENOSPC;
+               return id;
        }
 
        msq->q_perm.id = msg_buildid(id, msq->q_perm.seq);