From patchwork Thu Mar 12 03:13:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 449284 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2840714010F for ; Thu, 12 Mar 2015 14:14:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751558AbbCLDOZ (ORCPT ); Wed, 11 Mar 2015 23:14:25 -0400 Received: from mail-by2on0129.outbound.protection.outlook.com ([207.46.100.129]:31904 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751257AbbCLDOX (ORCPT ); Wed, 11 Mar 2015 23:14:23 -0400 Received: from snotra.am.freescale.net (192.88.168.49) by BY2PR0301MB0726.namprd03.prod.outlook.com (25.160.63.16) with Microsoft SMTP Server (TLS) id 15.1.106.15; Thu, 12 Mar 2015 03:14:20 +0000 From: Scott Wood To: , CC: Scott Wood , , , Subject: [PATCH 02/22] netfilter: %pF is only for function pointers Date: Wed, 11 Mar 2015 22:13:37 -0500 Message-ID: <1426130037-17956-2-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426130037-17956-1-git-send-email-scottwood@freescale.com> References: <1426130037-17956-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BN1PR08CA0019.namprd08.prod.outlook.com (10.242.217.147) To BY2PR0301MB0726.namprd03.prod.outlook.com (25.160.63.16) Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0726; X-Forefront-Antispam-Report: BMV:1; SFV:NSPM; SFS:(10019020)(6009001)(122386002)(92566002)(62966003)(40100003)(19580395003)(19580405001)(77156002)(46102003)(50226001)(42186005)(2950100001)(50986999)(87976001)(575784001)(86362001)(47776003)(50466002)(229853001)(36756003)(66066001)(48376002)(33646002)(76176999); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB0726; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5002009)(5005006); SRVR:BY2PR0301MB0726; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0726; X-Forefront-PRVS: 05134F8B4F X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2015 03:14:20.8189 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0726 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use %pS for actual addresses, otherwise you'll get bad output on arches like ppc64 where %pF expects a function descriptor. Signed-off-by: Scott Wood Cc: netdev@vger.kernel.org Cc: netfilter-devel@vger.kernel.org Cc: lvs-devel@vger.kernel.org --- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index b0f7b62..f9f3c3d 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -184,7 +184,7 @@ static inline int ip_vs_conn_hash(struct ip_vs_conn *cp) hlist_add_head_rcu(&cp->c_list, &ip_vs_conn_tab[hash]); ret = 1; } else { - pr_err("%s(): request for already hashed, called from %pF\n", + pr_err("%s(): request for already hashed, called from %pS\n", __func__, __builtin_return_address(0)); ret = 0; } diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index ed99448..bd1ef52 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -300,7 +300,7 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc) unsigned int hash; if (svc->flags & IP_VS_SVC_F_HASHED) { - pr_err("%s(): request for already hashed, called from %pF\n", + pr_err("%s(): request for already hashed, called from %pS\n", __func__, __builtin_return_address(0)); return 0; } @@ -334,7 +334,7 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc) static int ip_vs_svc_unhash(struct ip_vs_service *svc) { if (!(svc->flags & IP_VS_SVC_F_HASHED)) { - pr_err("%s(): request for unhash flagged, called from %pF\n", + pr_err("%s(): request for unhash flagged, called from %pS\n", __func__, __builtin_return_address(0)); return 0; }