Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1638113d9d8b7e04c1eeae9014d43f6381a74040

Authored by Michel Lespinasse
Committed by Linus Torvalds
1 parent 1ae1c1d09f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ipc/mqueue: remove unnecessary rb_init_node() calls 

Commit d6629859b36d ("ipc/mqueue: improve performance of send/recv") and
ce2d52cc ("ipc/mqueue: add rbtree node caching support") introduced an
rbtree of message priorities, and usage of rb_init_node() to initialize
the corresponding nodes.  As it turns out, rb_init_node() is unnecessary
here, as the nodes are fully initialized on insertion by rb_link_node()
and the code doesn't access nodes that aren't inserted on the rbtree.

Removing the rb_init_node() calls as I removed that function during
rbtree API cleanups (the only other use of it was in a place that
similarly didn't require it).

Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 0 additions and 3 deletions Side-by-side Diff

... ... @@ -142,7 +142,6 @@
142 142 leaf = kmalloc(sizeof(*leaf), GFP_ATOMIC);
143 143 if (!leaf)
144 144 return -ENOMEM;
145   - rb_init_node(&leaf->rb_node);
146 145 INIT_LIST_HEAD(&leaf->msg_list);
147 146 info->qsize += sizeof(*leaf);
148 147 }
... ... @@ -1013,7 +1012,6 @@
1013 1012  
1014 1013 if (!info->node_cache && new_leaf) {
1015 1014 /* Save our speculative allocation into the cache */
1016   - rb_init_node(&new_leaf->rb_node);
1017 1015 INIT_LIST_HEAD(&new_leaf->msg_list);
1018 1016 info->node_cache = new_leaf;
1019 1017 info->qsize += sizeof(*new_leaf);
... ... @@ -1121,7 +1119,6 @@
1121 1119  
1122 1120 if (!info->node_cache && new_leaf) {
1123 1121 /* Save our speculative allocation into the cache */
1124   - rb_init_node(&new_leaf->rb_node);
1125 1122 INIT_LIST_HEAD(&new_leaf->msg_list);
1126 1123 info->node_cache = new_leaf;
1127 1124 info->qsize += sizeof(*new_leaf);