From patchwork Wed Sep 6 20:28:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 810778 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xnZxG3mqmz9t2r for ; Thu, 7 Sep 2017 06:31:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753178AbdIFUa7 (ORCPT ); Wed, 6 Sep 2017 16:30:59 -0400 Received: from mout.gmx.net ([212.227.15.18]:64434 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752693AbdIFU2S (ORCPT ); Wed, 6 Sep 2017 16:28:18 -0400 Received: from p100.fritz.box ([193.159.16.8]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MBExR-1diJ5A3ukv-00AF12; Wed, 06 Sep 2017 22:28:10 +0200 From: Helge Deller To: linux-kernel@vger.kernel.org Cc: Sergey Senozhatsky , Petr Mladek , Andrew Morton , Wensong Zhang , netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org Subject: [PATCH 13/14] netfilter/ipvs: Use %pS printk format for direct addresses Date: Wed, 6 Sep 2017 22:28:00 +0200 Message-Id: <1504729681-3504-14-git-send-email-deller@gmx.de> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1504729681-3504-1-git-send-email-deller@gmx.de> References: <1504729681-3504-1-git-send-email-deller@gmx.de> X-Provags-ID: V03:K0:IPyGDTPDEnlrPYfs7kn5j/D4+CPakpL71kinjb3VoHWpgkjlMhL GWQJgI0K0DgVCQ3UNQsRqSzuEMaVa9zwvm1FkgW0EEcx8UWgbmyhkl+RcOJbkUysKRQdlDs uwcab4crvYy7h86Dnhjz/1nnmpKmhPFYXDj+Sae790mqmd0y7wKYdHsFq8xL4OxnEDGMsAv nrs0l1jQqNY6jQTaEawtQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:d4QUHjZIVv0=:AkYT+HNVjjPCcreJtkVysI 6H9/fVr7B3hch+24YRtV30mZj86zUHxYsEKCGjN/ajwVEJLSEEVd8+1RO6UcTzmykHwgBlMxL CxVXm81sUQZU04kwLmnef9n7NKWhiU6qx1n+Ypp1llT2SgYnSnSwqJ+isy3fvhFJALgTMFuVA OmqADF4W+mOmHI3+oEwE+7VkuKNcy/QYOviId9pE71UcbWT4W3iPDerubC8+YcYvJkbvswd8R I0pafSuMd9ouZWEJnlC/AC2uChmW848VKsQmzFeALtz+jeULcgl4kHKzyJNwnsglpcvdjFaDl 6KGErGbJGY9m/lmVGp7giN+Knv8lGmrTa22ht4y3plW4fYc6JAoRrKnHICe7S1Hkv3wNywuQX i3uJ33mXU3XNi02kuuceQPwLSKG5rvlWTyxHI0X5SgB+Xjoc0nsX37qbCLaNURLGGvD5O5C5t M2YHD8M8gk4ydpyf+yZybtXt8f6ZunZi17e+9l3c4Pf7yD4z66GVWWqd2iziQpn5dLqNUtVAK 5wR6Gb8GoYESM2lnvJGn/W3hYzndV3IeGH4eldLGEKqAapmnt27k+CCl60h7TYnzRkSI8D7EA WD/PWWx5WcSfa3FXAWOYCo5lihoKwFn2ajmaUIBgUFUc8Z/W8War/mUbCIkJkj7bnjqQkpR92 HLgOtrGSs/jNmZUzH8lgo9dXLKGCknRvyhrNxJGDZz0VzFWRBlZ1q3B1/0Nq/I88qio4HmHos ArJgy1g2pz+4RCfoFyQLO7rW0LVRH1oEWeMJMPC8zfd4V9x/ZKN9TLStvMbpBGthl5fc1wU9+ cdcw/c7CxMHI/nHnc79gTdOhJMNww== Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The debug and error printk functions in ipvs uses wrongly the %pF instead of the %pS printk format specifier for printing symbols for the address returned by _builtin_return_address(0). Fix it for the ia64, ppc64 and parisc64 architectures. Signed-off-by: Helge Deller Cc: Wensong Zhang Cc: netdev@vger.kernel.org Cc: lvs-devel@vger.kernel.org Cc: netfilter-devel@vger.kernel.org Acked-by: Simon Horman --- 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 3d2ac71a..f73561c 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -185,7 +185,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 1fa3c23..88fc58a 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; }