From 39e21dd7e3d7281a90d650f19b50f6dad222ea62 Mon Sep 17 00:00:00 2001 From: David Smith Date: Mon, 10 Feb 2014 10:18:34 -0600 Subject: [PATCH] Fix PR16542 by updating the rpc tapset. * tapset/linux/rpc.stp: Handle the removal of the rpc_clnt 'cl_protname' field. --- tapset/linux/rpc.stp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tapset/linux/rpc.stp b/tapset/linux/rpc.stp index 0b8d9578d..10c9d7491 100644 --- a/tapset/linux/rpc.stp +++ b/tapset/linux/rpc.stp @@ -289,7 +289,8 @@ probe sunrpc.clnt.clone_client = kernel.function("rpc_clone_client") !, servername = kernel_string(@choose_defined($clnt->cl_server, @cast(rcu_dereference($clnt->cl_xprt), "struct rpc_xprt")->servername)) - progname = kernel_string($clnt->cl_protname) + progname = kernel_string(@choose_defined($clnt->cl_program->name, + $clnt->cl_protname)) prog = prog_from_clnt($clnt) vers = vers_from_clnt($clnt) prot = prot_from_clnt($clnt) @@ -337,7 +338,8 @@ probe sunrpc.clnt.shutdown_client = kernel.function("rpc_shutdown_client") !, servername = kernel_string(@choose_defined($clnt->cl_server, @cast(rcu_dereference($clnt->cl_xprt), "struct rpc_xprt")->servername)) - progname = kernel_string($clnt->cl_protname) + progname = kernel_string(@choose_defined($clnt->cl_program->name, + $clnt->cl_protname)) prog = prog_from_clnt($clnt) vers = vers_from_clnt($clnt) prot = prot_from_clnt($clnt) @@ -409,7 +411,8 @@ probe sunrpc.clnt.bind_new_program = servername = kernel_string(@choose_defined($old->cl_server, @cast(rcu_dereference($old->cl_xprt), "struct rpc_xprt")->servername)) - old_progname = kernel_string($old->cl_protname) + old_progname = kernel_string(@choose_defined($old->cl_program->name, + $old->cl_protname)) old_prog = prog_from_clnt($old) old_vers = vers_from_clnt($old) progname = kernel_string($program->name) @@ -450,7 +453,8 @@ probe sunrpc.clnt.call_sync = kernel.function("rpc_call_sync") !, servername = kernel_string(@choose_defined($clnt->cl_server, @cast(rcu_dereference($clnt->cl_xprt), "struct rpc_xprt")->servername)) - progname = kernel_string($clnt->cl_protname) + progname = kernel_string(@choose_defined($clnt->cl_program->name, + $clnt->cl_protname)) prog = prog_from_clnt($clnt) vers = vers_from_clnt($clnt) prot = prot_from_clnt($clnt) @@ -497,7 +501,8 @@ probe sunrpc.clnt.call_async = kernel.function("rpc_call_async") !, servername = kernel_string(@choose_defined($clnt->cl_server, @cast(rcu_dereference($clnt->cl_xprt), "struct rpc_xprt")->servername)) - progname = kernel_string($clnt->cl_protname) + progname = kernel_string(@choose_defined($clnt->cl_program->name, + $clnt->cl_protname)) prog = prog_from_clnt($clnt) vers = vers_from_clnt($clnt) prot = prot_from_clnt($clnt) -- 2.43.5