Merge branch 'nfsd-5.8' of git://linux-nfs.org/~cel/cel-2.6 into for-5.8-incoming

[sfrench/cifs-2.6.git] / net / sunrpc / svc.c

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index e534f8f082e77c2fc16efb07ba32c5c34eef788f..c211b607239ed6c866a805bfda4f818dc4584805 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -991,6 +991,7 @@ static int __svc_register(struct net *net, const char *progname,
 #endif
        }
 
+       trace_svc_register(progname, version, protocol, port, family, error);
        return error;
 }
 
@@ -1000,11 +1001,6 @@ int svc_rpcbind_set_version(struct net *net,
                            unsigned short proto,
                            unsigned short port)
 {
-       dprintk("svc: svc_register(%sv%d, %s, %u, %u)\n",
-               progp->pg_name, version,
-               proto == IPPROTO_UDP?  "udp" : "tcp",
-               port, family);
-
        return __svc_register(net, progp->pg_name, progp->pg_prog,
                                version, family, proto, port);
 
@@ -1024,11 +1020,8 @@ int svc_generic_rpcbind_set(struct net *net,
                return 0;
 
        if (vers->vs_hidden) {
-               dprintk("svc: svc_register(%sv%d, %s, %u, %u)"
-                       " (but not telling portmap)\n",
-                       progp->pg_name, version,
-                       proto == IPPROTO_UDP?  "udp" : "tcp",
-                       port, family);
+               trace_svc_noregister(progp->pg_name, version, proto,
+                                    port, family, 0);
                return 0;
        }
 
@@ -1106,8 +1099,7 @@ static void __svc_unregister(struct net *net, const u32 program, const u32 versi
        if (error == -EPROTONOSUPPORT)
                error = rpcb_register(net, program, version, 0, 0);
 
-       dprintk("svc: %s(%sv%u), error %d\n",
-                       __func__, progname, version, error);
+       trace_svc_unregister(progname, version, error);
 }
 
 /*
@@ -1132,9 +1124,6 @@ static void svc_unregister(const struct svc_serv *serv, struct net *net)
                                continue;
                        if (progp->pg_vers[i]->vs_hidden)
                                continue;
-
-                       dprintk("svc: attempting to unregister %sv%u\n",
-                               progp->pg_name, i);
                        __svc_unregister(net, progp->pg_prog, i, progp->pg_name);
                }
        }