diff options
-rw-r--r-- | ipc/mqueue.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index a24ba9fe5bb8..161a1807e6ef 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -142,7 +142,6 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info) | |||
142 | if (!leaf) | 142 | if (!leaf) |
143 | return -ENOMEM; | 143 | return -ENOMEM; |
144 | INIT_LIST_HEAD(&leaf->msg_list); | 144 | INIT_LIST_HEAD(&leaf->msg_list); |
145 | info->qsize += sizeof(*leaf); | ||
146 | } | 145 | } |
147 | leaf->priority = msg->m_type; | 146 | leaf->priority = msg->m_type; |
148 | rb_link_node(&leaf->rb_node, parent, p); | 147 | rb_link_node(&leaf->rb_node, parent, p); |
@@ -187,7 +186,6 @@ try_again: | |||
187 | "lazy leaf delete!\n"); | 186 | "lazy leaf delete!\n"); |
188 | rb_erase(&leaf->rb_node, &info->msg_tree); | 187 | rb_erase(&leaf->rb_node, &info->msg_tree); |
189 | if (info->node_cache) { | 188 | if (info->node_cache) { |
190 | info->qsize -= sizeof(*leaf); | ||
191 | kfree(leaf); | 189 | kfree(leaf); |
192 | } else { | 190 | } else { |
193 | info->node_cache = leaf; | 191 | info->node_cache = leaf; |
@@ -200,7 +198,6 @@ try_again: | |||
200 | if (list_empty(&leaf->msg_list)) { | 198 | if (list_empty(&leaf->msg_list)) { |
201 | rb_erase(&leaf->rb_node, &info->msg_tree); | 199 | rb_erase(&leaf->rb_node, &info->msg_tree); |
202 | if (info->node_cache) { | 200 | if (info->node_cache) { |
203 | info->qsize -= sizeof(*leaf); | ||
204 | kfree(leaf); | 201 | kfree(leaf); |
205 | } else { | 202 | } else { |
206 | info->node_cache = leaf; | 203 | info->node_cache = leaf; |
@@ -1034,7 +1031,6 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, | |||
1034 | /* Save our speculative allocation into the cache */ | 1031 | /* Save our speculative allocation into the cache */ |
1035 | INIT_LIST_HEAD(&new_leaf->msg_list); | 1032 | INIT_LIST_HEAD(&new_leaf->msg_list); |
1036 | info->node_cache = new_leaf; | 1033 | info->node_cache = new_leaf; |
1037 | info->qsize += sizeof(*new_leaf); | ||
1038 | new_leaf = NULL; | 1034 | new_leaf = NULL; |
1039 | } else { | 1035 | } else { |
1040 | kfree(new_leaf); | 1036 | kfree(new_leaf); |
@@ -1142,7 +1138,6 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, | |||
1142 | /* Save our speculative allocation into the cache */ | 1138 | /* Save our speculative allocation into the cache */ |
1143 | INIT_LIST_HEAD(&new_leaf->msg_list); | 1139 | INIT_LIST_HEAD(&new_leaf->msg_list); |
1144 | info->node_cache = new_leaf; | 1140 | info->node_cache = new_leaf; |
1145 | info->qsize += sizeof(*new_leaf); | ||
1146 | } else { | 1141 | } else { |
1147 | kfree(new_leaf); | 1142 | kfree(new_leaf); |
1148 | } | 1143 | } |