Messages in this thread Patch in this message | | | Date | Thu, 6 Sep 2012 23:03:37 -0700 | From | "tip-bot for Suzuki K. Poulose" <> | Subject | [tip:perf/core] perf tools: Fix intlist node removal |
| |
Commit-ID: 60ebf328762914b80d3e4e5f07bda599043c8eda Gitweb: http://git.kernel.org/tip/60ebf328762914b80d3e4e5f07bda599043c8eda Author: Suzuki K. Poulose <suzuki@in.ibm.com> AuthorDate: Fri, 31 Aug 2012 12:28:47 +0530 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Wed, 5 Sep 2012 17:35:24 -0300
perf tools: Fix intlist node removal
Similar to the one in : https://lkml.org/lkml/2012/8/29/27
Make sure we remove the node from the rblist before we delete the node. The rblist__remove_node() will invoke rblist->node_delete, which will take care of deleting the node with the suitable function provided by the user.
Signed-off-by: Suzuki K Poulose <suzuki@in.ibm.com> Acked-by: David Ahern <dsahern@gmail.com> Cc: David Ahern <dsahern@gmail.com> Cc: Suzuki K Poulose <suzuki@in.ibm.com> Link: http://lkml.kernel.org/r/20120831065840.5167.90318.stgit@suzukikp.in.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/intlist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/intlist.c b/tools/perf/util/intlist.c index fd530dc..77c504f 100644 --- a/tools/perf/util/intlist.c +++ b/tools/perf/util/intlist.c @@ -52,9 +52,9 @@ int intlist__add(struct intlist *ilist, int i) return rblist__add_node(&ilist->rblist, (void *)((long)i)); } -void intlist__remove(struct intlist *ilist __used, struct int_node *node) +void intlist__remove(struct intlist *ilist, struct int_node *node) { - int_node__delete(node); + rblist__remove_node(&ilist->rblist, &node->rb_node); } struct int_node *intlist__find(struct intlist *ilist, int i)
| |