All of lore.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot for Suzuki K. Poulose" <suzuki@in.ibm.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
	mingo@kernel.org, suzuki@in.ibm.com, dsahern@gmail.com,
	tglx@linutronix.de
Subject: [tip:perf/core] perf tools: Fix intlist node removal
Date: Thu, 6 Sep 2012 23:03:37 -0700	[thread overview]
Message-ID: <tip-60ebf328762914b80d3e4e5f07bda599043c8eda@git.kernel.org> (raw)
In-Reply-To: <20120831065840.5167.90318.stgit@suzukikp.in.ibm.com>

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)

  parent reply	other threads:[~2012-09-07  6:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-29  6:00 [PATCH] [perf] Remove the node from rblist in strlist__remove Suzuki K. Poulose
2012-08-29  6:29 ` David Ahern
2012-08-29  6:39   ` Suzuki K. Poulose
2012-08-31  6:58   ` [PATCH] [perf] Fix intlist node removal Suzuki K. Poulose
2012-08-31 16:10     ` David Ahern
2012-09-07  6:03     ` tip-bot for Suzuki K. Poulose [this message]
2012-09-07  6:04 ` [tip:perf/core] perf tools: Remove the node from rblist in strlist__remove tip-bot for Suzuki K. Poulose
2012-11-03 20:07   ` Hannes Frederic Sowa
2012-11-05 15:04     ` David Ahern

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-60ebf328762914b80d3e4e5f07bda599043c8eda@git.kernel.org \
    --to=suzuki@in.ibm.com \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.