public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
	Andrew Morton <akpm@linux-foundation.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	Neil Horman <nhorman@tuxdriver.com>,
	"David S. Miller" <davem@davemloft.net>,
	Thomas Gleixner <tglx@linutronix.de>,
	Zhaolei <zhaolei@cn.fujitsu.com>
Subject: [PATCH 3/7] tracing: remove duplicate null-pointer check in skb tracepoint
Date: Sat, 08 Jan 2011 15:16:02 -0500	[thread overview]
Message-ID: <20110108201645.155505021@goodmis.org> (raw)
In-Reply-To: 20110108201559.130182944@goodmis.org

[-- Attachment #1: 0003-tracing-remove-duplicate-null-pointer-check-in-skb-t.patch --]
[-- Type: text/plain, Size: 1185 bytes --]

From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

The check for NULL skb in the kfree_skb trace event is a duplicate from the
check already done in its only caller, kfree_skb(). Remove this duplicate check.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
LKML-Reference: <20110106175319.GA30610@Krystal>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: David S. Miller <davem@davemloft.net>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Zhaolei <zhaolei@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 include/trace/events/skb.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index 75ce9d5..f10293c 100644
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -25,9 +25,7 @@ TRACE_EVENT(kfree_skb,
 
 	TP_fast_assign(
 		__entry->skbaddr = skb;
-		if (skb) {
-			__entry->protocol = ntohs(skb->protocol);
-		}
+		__entry->protocol = ntohs(skb->protocol);
 		__entry->location = location;
 	),
 
-- 
1.7.2.3



  parent reply	other threads:[~2011-01-08 20:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-08 20:15 [PATCH 0/7] [GIT PULL][2.6.38] tracing: updates and fixes Steven Rostedt
2011-01-08 20:16 ` [PATCH 1/7] tracing: Include module.h in define_trace.h Steven Rostedt
2011-01-08 20:16 ` [PATCH 2/7] tracing/trivial: Add missing comma in TRACE_EVENT comment Steven Rostedt
2011-01-08 20:16 ` Steven Rostedt [this message]
2011-01-08 20:16 ` [PATCH 4/7] tracepoint: Add __rcu annotation Steven Rostedt
2011-01-08 20:16 ` [PATCH 5/7] tracing: Fix preempt count leak Steven Rostedt
2011-01-08 20:16 ` [PATCH 6/7] tracing: Fix TRACE_EVENT power tracepoint creation Steven Rostedt
2011-01-08 20:16 ` [PATCH 7/7] dynamic debug: Fix build issue with older gcc Steven Rostedt

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=20110108201645.155505021@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mingo@elte.hu \
    --cc=nhorman@tuxdriver.com \
    --cc=tglx@linutronix.de \
    --cc=zhaolei@cn.fujitsu.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox