From bc741b536f24040a687a44518ac3de2702a4c45c Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Wed, 10 Apr 2013 10:32:05 +0100 Subject: [PATCH] --- yaml --- r: 367271 b: refs/heads/master c: 7bd8b2eb32c404ebe61986083ce02642b6ff3bf6 h: refs/heads/master i: 367269: d13a98d42677b2b3e04a70dfe947992a8a5d645b 367267: ba9488f37ae39c58300eed5ccba19bc6e252dded 367263: f5af304add21bf9188b0a38d9d7a24641bc6fd99 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/glock.c | 2 +- trunk/fs/gfs2/trace_gfs2.h | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index df7ff3104f26..2a1807ad81e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81ffbf654f0cfeeb44e69832b3d301958a4108d8 +refs/heads/master: 7bd8b2eb32c404ebe61986083ce02642b6ff3bf6 diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c index 77d7927bcd75..3b9e1788ebf9 100644 --- a/trunk/fs/gfs2/glock.c +++ b/trunk/fs/gfs2/glock.c @@ -926,7 +926,7 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state, } if (gl->gl_ops->go_callback) gl->gl_ops->go_callback(gl, remote); - trace_gfs2_demote_rq(gl); + trace_gfs2_demote_rq(gl, remote); } void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) diff --git a/trunk/fs/gfs2/trace_gfs2.h b/trunk/fs/gfs2/trace_gfs2.h index 2ee13e841e9f..20c007d747ab 100644 --- a/trunk/fs/gfs2/trace_gfs2.h +++ b/trunk/fs/gfs2/trace_gfs2.h @@ -159,9 +159,9 @@ TRACE_EVENT(gfs2_glock_put, /* Callback (local or remote) requesting lock demotion */ TRACE_EVENT(gfs2_demote_rq, - TP_PROTO(const struct gfs2_glock *gl), + TP_PROTO(const struct gfs2_glock *gl, bool remote), - TP_ARGS(gl), + TP_ARGS(gl, remote), TP_STRUCT__entry( __field( dev_t, dev ) @@ -170,6 +170,7 @@ TRACE_EVENT(gfs2_demote_rq, __field( u8, cur_state ) __field( u8, dmt_state ) __field( unsigned long, flags ) + __field( bool, remote ) ), TP_fast_assign( @@ -179,14 +180,16 @@ TRACE_EVENT(gfs2_demote_rq, __entry->cur_state = glock_trace_state(gl->gl_state); __entry->dmt_state = glock_trace_state(gl->gl_demote_state); __entry->flags = gl->gl_flags | (gl->gl_object ? (1UL<remote = remote; ), - TP_printk("%u,%u glock %d:%lld demote %s to %s flags:%s", + TP_printk("%u,%u glock %d:%lld demote %s to %s flags:%s %s", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->gltype, (unsigned long long)__entry->glnum, glock_trace_name(__entry->cur_state), glock_trace_name(__entry->dmt_state), - show_glock_flags(__entry->flags)) + show_glock_flags(__entry->flags), + __entry->remote ? "remote" : "local") );