LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[PATCH 02/22] netfilter: %pF is only for function pointers

To: <trivial@xxxxxxxxxx>, <linux-kernel@xxxxxxxxxxxxxxx>
Subject: [PATCH 02/22] netfilter: %pF is only for function pointers
Cc: Scott Wood <scottwood@xxxxxxxxxxxxx>, <netdev@xxxxxxxxxxxxxxx>, <netfilter-devel@xxxxxxxxxxxxxxx>, <lvs-devel@xxxxxxxxxxxxxxx>
From: Scott Wood <scottwood@xxxxxxxxxxxxx>
Date: Wed, 11 Mar 2015 22:13:37 -0500
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 <scottwood@xxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
Cc: netfilter-devel@xxxxxxxxxxxxxxx
Cc: lvs-devel@xxxxxxxxxxxxxxx
---
 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;
        }
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 02/22] netfilter: %pF is only for function pointers, Scott Wood <=