diff options
Diffstat (limited to 'tapset/LKET')
| -rw-r--r-- | tapset/LKET/Changelog | 8 | ||||
| -rwxr-xr-x | tapset/LKET/nfs.stp | 4 | ||||
| -rwxr-xr-x | tapset/LKET/rpc.stp | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/tapset/LKET/Changelog b/tapset/LKET/Changelog index 9f267636..342e2a54 100644 --- a/tapset/LKET/Changelog +++ b/tapset/LKET/Changelog @@ -1,3 +1,11 @@ +2007-03-09 Pierre Peiffer <pierre.peiffer@bull.net> + + * 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. + 2007-02-06 Josh Stone <joshua.i.stone@intel.com> * nfs.stp, nfs_proc.stp, nfsd.stp, process.stp, tskdispatch.stp: diff --git a/tapset/LKET/nfs.stp b/tapset/LKET/nfs.stp index 7267da74..63852d61 100755 --- a/tapset/LKET/nfs.stp +++ b/tapset/LKET/nfs.stp @@ -1,8 +1,8 @@ /* Helper functions */ function __file_fsname:string (file:long) %{ /* pure */ struct file *file = (struct file *)(long)THIS->file; - struct dentry *f_dentry = file? kread(&(file->f_dentry)) : NULL; - struct inode *d_inode = f_dentry? kread(&(f_dentry->d_inode)) : NULL; + struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; + struct inode *d_inode = dentry? kread(&(dentry->d_inode)) : NULL; if (d_inode == NULL) strlcpy(THIS->__retvalue, "NULL", MAXSTRINGLEN); else { diff --git a/tapset/LKET/rpc.stp b/tapset/LKET/rpc.stp index f78b585d..b9c8ca60 100755 --- a/tapset/LKET/rpc.stp +++ b/tapset/LKET/rpc.stp @@ -697,7 +697,11 @@ probe addevent.sunrpc.sched.execute.return probe _addevent.sunrpc.sched.execute.return = sunrpc.sched.execute.return { +%( kernel_v <= "2.6.20" %? log_sunrpc_return_int64(HOOKID_SUNRPC_SCHED_EXECUTE_RETURN, $return) +%: + log_sunrpc_return_void(HOOKID_SUNRPC_SCHED_EXECUTE_RETURN) +%) } function log_sunrpc_execute(hookid:long, xid:long, prog:long, vers:long, |