From 9956e5fcfbe5a62cea97e542dfc828c3be09eeb4 Mon Sep 17 00:00:00 2001 From: fche Date: Tue, 20 Mar 2007 16:22:34 +0000 Subject: * applying kernel drift patches 2007-03-09 Pierre Peiffer * nfsd.stp (nfsd.dispatch): Change initialization of variable client_ip with a call to addr_from_rqst. * rpc.stp (addr_from_rqst): - update with changes in struct svc_rqst - __rpc_execute returns void now. struct rpc_xprt modified since kernel 2.6.19. * nfs.stp, vfs.stp: Local variables f_dentry renamed, because conflicting with a new #define in kernel header linux/fs.h in 2.6.20. 2007-03-09 Pierre Peiffer * nfs.stp: Local variables f_dentry renamed, because conflicting with a new #define in kernel header linux/fs.h in 2.6.20. * rpc.stp (_addevent.sunrpc.sched.execute.return): update with __rpc_execute which returns void since kernel 2.6.21. --- tapset/nfsd.stp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'tapset/nfsd.stp') diff --git a/tapset/nfsd.stp b/tapset/nfsd.stp index 49f04f51..699ab17e 100644 --- a/tapset/nfsd.stp +++ b/tapset/nfsd.stp @@ -1,3 +1,14 @@ +// nfs tapset +// Copyright (C) 2006-2007 IBM Corp. +// Copyright (C) 2007 Intel Corporation. +// Copyright (C) 2007 Bull S.A.S +// +// This file is part of systemtap, and is free software. You can +// redistribute it and/or modify it under the terms of the GNU General +// Public License (GPL); either version 2, or (at your option) any +// later version. + + %{ #include #include @@ -131,7 +142,7 @@ function p_long:long(cnt:long) %{ /* pure */ probe nfsd.dispatch = kernel.function("nfsd_dispatch")?, module("nfsd").function("nfsd_dispatch") ? { - client_ip = $rqstp->rq_addr->sin_addr->s_addr + client_ip = addr_from_rqst($rqstp) proto = $rqstp->rq_prot version = $rqstp->rq_vers -- cgit