diff options
| author | fche <fche> | 2007-03-20 16:22:34 +0000 |
|---|---|---|
| committer | fche <fche> | 2007-03-20 16:22:34 +0000 |
| commit | 9956e5fcfbe5a62cea97e542dfc828c3be09eeb4 (patch) | |
| tree | 6ff8f8ec76898b288c00046cb0693218827fd3c4 /tapset/vfs.stp | |
| parent | ab655cf8ec35ab47a38d95182dfe07a0e380681a (diff) | |
| download | systemtap-steved-9956e5fcfbe5a62cea97e542dfc828c3be09eeb4.tar.gz systemtap-steved-9956e5fcfbe5a62cea97e542dfc828c3be09eeb4.tar.xz systemtap-steved-9956e5fcfbe5a62cea97e542dfc828c3be09eeb4.zip | |
* applying kernel drift patches
2007-03-09 Pierre Peiffer <pierre.peiffer@bull.net>
* 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 <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.
Diffstat (limited to 'tapset/vfs.stp')
| -rw-r--r-- | tapset/vfs.stp | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/tapset/vfs.stp b/tapset/vfs.stp index e10a2ed5..9ecce3cb 100644 --- a/tapset/vfs.stp +++ b/tapset/vfs.stp @@ -1,3 +1,13 @@ +// vfs 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. + /* generic vfs probes */ /* helper functions */ @@ -81,11 +91,11 @@ function __page_bdev:long (page:long) %{ /* pure */ function __file_dev:long (file:long) %{ /* pure */ struct file *file = (struct file *)(long)THIS->file; - struct dentry *f_dentry = file? kread(&(file->f_dentry)) : NULL; - if (f_dentry == NULL) { + struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; + if (dentry == NULL) { THIS->__retvalue = 0; } else { - struct inode *d_inode = kread(&(f_dentry->d_inode)); + struct inode *d_inode = kread(&(dentry->d_inode)); struct super_block *i_sb = kread(&(d_inode->i_sb)); THIS->__retvalue = kread(&(i_sb->s_dev)); } @@ -94,11 +104,11 @@ function __file_dev:long (file:long) %{ /* pure */ function __file_bdev:long (file:long) %{ /* pure */ struct file *file = (struct file *)(long)THIS->file; - struct dentry *f_dentry = file? kread(&(file->f_dentry)) : NULL; - if (f_dentry == NULL) { + struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; + if (dentry == NULL) { THIS->__retvalue = 0; } else { - struct inode *d_inode = kread(&(f_dentry->d_inode)); + struct inode *d_inode = kread(&(dentry->d_inode)); struct super_block *i_sb = kread(&(d_inode->i_sb)); THIS->__retvalue = (long)kread(&(i_sb->s_bdev)); } @@ -107,11 +117,11 @@ function __file_bdev:long (file:long) %{ /* pure */ function __file_ino:long (file:long) %{ /* pure */ struct file *file = (struct file *)(long)THIS->file; - struct dentry *f_dentry = file? kread(&(file->f_dentry)) : NULL; - if (f_dentry == NULL) { + struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; + if (dentry == NULL) { THIS->__retvalue = 0; } else { - struct inode *d_inode = kread(&(f_dentry->d_inode)); + struct inode *d_inode = kread(&(dentry->d_inode)); THIS->__retvalue = kread(&(d_inode->i_ino)); } CATCH_DEREF_FAULT(); @@ -119,11 +129,11 @@ function __file_ino:long (file:long) %{ /* pure */ function __file_maxbytes:long (file:long) %{ /* pure */ struct file *file = (struct file *)(long)THIS->file; - struct dentry *f_dentry = file? kread(&(file->f_dentry)) : NULL; - if (f_dentry == NULL) { + struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; + if (dentry == NULL) { THIS->__retvalue = 0; } else { - struct inode *d_inode = kread(&(f_dentry->d_inode)); + struct inode *d_inode = kread(&(dentry->d_inode)); struct super_block *i_sb = kread(&(d_inode->i_sb)); THIS->__retvalue = kread(&(i_sb->s_maxbytes)); } @@ -132,8 +142,8 @@ function __file_maxbytes:long (file:long) %{ /* pure */ function __file_filename:string (file:long) %{ /* pure */ struct file *file = (struct file *)(long)THIS->file; - struct dentry *f_dentry = file? kread(&(file->f_dentry)) : NULL; - const unsigned char *name = f_dentry? kread(&(f_dentry->d_name.name)) : NULL; + struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; + const unsigned char *name = dentry? kread(&(dentry->d_name.name)) : NULL; if (name == NULL) { strlcpy(THIS->__retvalue, "NULL", MAXSTRINGLEN); } else { |