From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753021Ab1AIXoP (ORCPT ); Sun, 9 Jan 2011 18:44:15 -0500 Received: from mail.openrapids.net ([64.15.138.104]:40575 "EHLO blackscsi.openrapids.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752599Ab1AIXoM (ORCPT ); Sun, 9 Jan 2011 18:44:12 -0500 Date: Sun, 9 Jan 2011 18:44:10 -0500 From: Mathieu Desnoyers To: Dave Chinner Cc: LKML , Steven Rostedt , Ingo Molnar , Thomas Gleixner , Frederic Weisbecker , Steven Whitehouse , Christoph Hellwig , Alex Elder , Li Zefan Subject: Re: [RFC patch 27/28] trace event fs remove semicolons Message-ID: <20110109234410.GB9573@Krystal> References: <20110109215927.633266833@efficios.com> <20110109220512.512120254@efficios.com> <20110109233049.GB28803@dastard> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110109233049.GB28803@dastard> X-Editor: vi X-Info: http://www.efficios.com X-Operating-System: Linux/2.6.26-2-686 (i686) X-Uptime: 18:43:15 up 47 days, 4:46, 5 users, load average: 0.23, 0.05, 0.02 User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Dave Chinner (david@fromorbit.com) wrote: > On Sun, Jan 09, 2011 at 04:59:54PM -0500, Mathieu Desnoyers wrote: > > Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array > > of events, thus saving space for trace event probes. Remove extra trailing > > semicolons at the end of XFS and GFS2 trace event declarations. > > Can you split the patch in to a separate XFs and GFS2 patches > (similar to the ext4-only patch) so we can take it through the XFS > tree as needed? Second patch, for GFS2: trace event gfs2 remove semicolons Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of GFS2 trace event declarations. Signed-off-by: Mathieu Desnoyers CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner CC: Steven Whitehouse --- fs/gfs2/trace_gfs2.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) Index: linux-2.6-lttng/fs/gfs2/trace_gfs2.h =================================================================== --- linux-2.6-lttng.orig/fs/gfs2/trace_gfs2.h +++ linux-2.6-lttng/fs/gfs2/trace_gfs2.h @@ -42,8 +42,8 @@ {(1UL << GLF_FROZEN), "F" }, \ {(1UL << GLF_QUEUED), "q" }) -#ifndef NUMPTY -#define NUMPTY +#ifndef _TRACE_GFS2_DEF_ +#define _TRACE_GFS2_DEF_ static inline u8 glock_trace_state(unsigned int state) { switch(state) { @@ -56,7 +56,7 @@ static inline u8 glock_trace_state(unsig } return DLM_LOCK_NL; } -#endif +#endif /* _TRACE_GFS2_DEF_ */ /* Section 1 - Locking * @@ -105,7 +105,7 @@ TRACE_EVENT(gfs2_glock_state_change, glock_trace_name(__entry->tgt_state), glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +) /* State change -> unlocked, glock is being deallocated */ TRACE_EVENT(gfs2_glock_put, @@ -137,7 +137,7 @@ TRACE_EVENT(gfs2_glock_put, glock_trace_name(DLM_LOCK_IV), show_glock_flags(__entry->flags)) -); +) /* Callback (local or remote) requesting lock demotion */ TRACE_EVENT(gfs2_demote_rq, @@ -171,7 +171,7 @@ TRACE_EVENT(gfs2_demote_rq, glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +) /* Promotion/grant of a glock */ TRACE_EVENT(gfs2_promote, @@ -201,7 +201,7 @@ TRACE_EVENT(gfs2_promote, (unsigned long long)__entry->glnum, __entry->first ? "first": "other", glock_trace_name(__entry->state)) -); +) /* Queue/dequeue a lock request */ TRACE_EVENT(gfs2_glock_queue, @@ -231,7 +231,7 @@ TRACE_EVENT(gfs2_glock_queue, (unsigned long long)__entry->glnum, __entry->queue ? "" : "de", glock_trace_name(__entry->state)) -); +) /* Section 2 - Log/journal * @@ -270,7 +270,7 @@ TRACE_EVENT(gfs2_pin, (unsigned long long)__entry->block, (unsigned long)__entry->len, (unsigned long long)__entry->ino) -); +) /* Flushing the log */ TRACE_EVENT(gfs2_log_flush, @@ -295,7 +295,7 @@ TRACE_EVENT(gfs2_log_flush, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->start ? "start" : "end", (unsigned long long)__entry->log_seq) -); +) /* Reserving/releasing blocks in the log */ TRACE_EVENT(gfs2_log_blocks, @@ -316,7 +316,7 @@ TRACE_EVENT(gfs2_log_blocks, TP_printk("%u,%u log reserve %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->blocks) -); +) /* Section 3 - bmap * @@ -364,7 +364,7 @@ TRACE_EVENT(gfs2_bmap, (unsigned long long)__entry->pblock, __entry->state, __entry->create ? "create " : "nocreate", __entry->errno) -); +) /* Keep track of blocks as they are allocated/freed */ TRACE_EVENT(gfs2_block_alloc, @@ -396,7 +396,7 @@ TRACE_EVENT(gfs2_block_alloc, (unsigned long long)__entry->start, (unsigned long)__entry->len, block_state_name(__entry->block_state)) -); +) #endif /* _TRACE_GFS2_H */ -- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com