From 2a9de6c0fa176c385f683a0987d83e21997c96f3 Mon Sep 17 00:00:00 2001 From: Michel Lespinasse Date: Mon, 8 Oct 2012 16:30:26 -0700 Subject: [PATCH] --- yaml --- r: 332383 b: refs/heads/master c: 1638113d9d8b7e04c1eeae9014d43f6381a74040 h: refs/heads/master i: 332381: e85ac0e8a745d4db0c62ee149c5c33767c19386e 332379: cd13d7bb22aed6420ec8cb8e817e7a6b62e913fb 332375: e12d898b05bd9b177c221a6458744e910367a5db 332367: 50222e5444e0e96f6ce824ca65c93ece97f669e6 332351: a62a70c215928c1d18141c9ba9e9f1bb725a01c1 v: v3 --- [refs] | 2 +- trunk/ipc/mqueue.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 323ce48a5a1b..8bcc75fa31d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ae1c1d09f220ded48ee9a7d91a65e94f95c4af1 +refs/heads/master: 1638113d9d8b7e04c1eeae9014d43f6381a74040 diff --git a/trunk/ipc/mqueue.c b/trunk/ipc/mqueue.c index 6d255e535d03..6b97e2466fad 100644 --- a/trunk/ipc/mqueue.c +++ b/trunk/ipc/mqueue.c @@ -142,7 +142,6 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info) leaf = kmalloc(sizeof(*leaf), GFP_ATOMIC); if (!leaf) return -ENOMEM; - rb_init_node(&leaf->rb_node); INIT_LIST_HEAD(&leaf->msg_list); info->qsize += sizeof(*leaf); } @@ -1013,7 +1012,6 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, if (!info->node_cache && new_leaf) { /* Save our speculative allocation into the cache */ - rb_init_node(&new_leaf->rb_node); INIT_LIST_HEAD(&new_leaf->msg_list); info->node_cache = new_leaf; info->qsize += sizeof(*new_leaf); @@ -1121,7 +1119,6 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, if (!info->node_cache && new_leaf) { /* Save our speculative allocation into the cache */ - rb_init_node(&new_leaf->rb_node); INIT_LIST_HEAD(&new_leaf->msg_list); info->node_cache = new_leaf; info->qsize += sizeof(*new_leaf);