From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755232Ab1ECVNb (ORCPT ); Tue, 3 May 2011 17:13:31 -0400 Received: from mail.openrapids.net ([64.15.138.104]:39733 "EHLO blackscsi.openrapids.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754316Ab1ECVNa (ORCPT ); Tue, 3 May 2011 17:13:30 -0400 Date: Tue, 3 May 2011 17:13:28 -0400 From: Mathieu Desnoyers To: Steven Whitehouse Cc: LKML , Steven Rostedt , Ingo Molnar , Thomas Gleixner , Frederic Weisbecker Subject: Re: [RFC patch 26/32] trace event gfs2 remove semicolons Message-ID: <20110503211328.GF32331@Krystal> References: <20110502211123.163877033@efficios.com> <20110502213215.535626022@efficios.com> <1304417644.4049.4.camel@dolmen> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1304417644.4049.4.camel@dolmen> X-Editor: vi X-Info: http://www.efficios.com X-Operating-System: Linux/2.6.26-2-686 (i686) X-Uptime: 17:11:46 up 161 days, 2:14, 5 users, load average: 0.00, 0.00, 0.00 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 * Steven Whitehouse (swhiteho@redhat.com) wrote: > Hi, > > On Mon, 2011-05-02 at 17:11 -0400, Mathieu Desnoyers wrote: > > plain text document attachment > > (trace-event-gfs2-remove-semicolons.patch) > > 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. > > > Note that there is a new tracepoint for GFS2 currently awaiting the next > merge window in the GFS2 -nmw git tree, so that will need to be patched > too. Otherwise, looks good to me, Thanks! We'll fix it when it gets merged. I'll add a note to that effect in the patch changelog. Mathieu > > Steve. > > > Signed-off-by: Mathieu Desnoyers > > Acked-by: Steven Whitehouse > > CC: Steven Rostedt > > CC: Frederic Weisbecker > > CC: Ingo Molnar > > CC: Thomas Gleixner > > --- > > 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