Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:51960 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754584AbbHYGFt (ORCPT ); Tue, 25 Aug 2015 02:05:49 -0400 From: Pratyush Anand To: bfields@fieldses.org Cc: rostedt@goodmis.org, linux-nfs@vger.kernel.org, Pratyush Anand , Ingo Molnar , "J. Bruce Fields" , Jeff Layton , linux-kernel@vger.kernel.org (open list), Masami Hiramatsu , Trond Myklebust Subject: [PATCH 2/2] net: sunrpc: fix trace print of &xprt->xpt_remote Date: Tue, 25 Aug 2015 11:34:20 +0530 Message-Id: <3e2f763f7701d7ff6915b52a3c80fd1f550ae951.1440482404.git.panand@redhat.com> In-Reply-To: References: In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org List-ID: TP_printk() for svc_xprt_dequeue intends to print address of xprt->xpt_remote, however it prints address of another structure where xprt->xpt_remote has been copied. This patch fixes the above behaviour. Signed-off-by: Pratyush Anand --- include/trace/events/sunrpc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 937e482d80e9..37b6af1a911a 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -556,19 +556,19 @@ TRACE_EVENT(svc_xprt_dequeue, TP_STRUCT__entry( __field(struct svc_xprt *, xprt) - __field_struct(struct sockaddr_storage, ss) + __field(struct sockaddr *, addr) __field(unsigned long, flags) ), TP_fast_assign( - __entry->xprt = xprt, - xprt ? memcpy(&__entry->ss, &xprt->xpt_remote, sizeof(__entry->ss)) : memset(&__entry->ss, 0, sizeof(__entry->ss)); + __entry->xprt = xprt; + __entry->addr = + xprt ? (struct sockaddr *)&xprt->xpt_remote : NULL; __entry->flags = xprt ? xprt->xpt_flags : 0; ), TP_printk("xprt=0x%p addr=%pIScp flags=%s", __entry->xprt, - (struct sockaddr *)&__entry->ss, - show_svc_xprt_flags(__entry->flags)) + __entry->addr, show_svc_xprt_flags(__entry->flags)) ); TRACE_EVENT(svc_wake_up, -- 2.4.3