diff options
| author | David Smith <dsmith@redhat.com> | 2010-03-09 15:39:15 -0600 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-03-09 15:39:15 -0600 |
| commit | 595187eb19a18c6f534d1e44aeb912c01b8dc41b (patch) | |
| tree | 951fcaa12eafdbddc2c6b4945a980a70cef72d1a /tapset/dentry.stp | |
| parent | a8350a5d1c6e99d6929d1891767c6ddee015137a (diff) | |
| download | systemtap-steved-595187eb19a18c6f534d1e44aeb912c01b8dc41b.tar.gz systemtap-steved-595187eb19a18c6f534d1e44aeb912c01b8dc41b.tar.xz systemtap-steved-595187eb19a18c6f534d1e44aeb912c01b8dc41b.zip | |
PR 11338 (partial): Used '@defined()' in task, dentry, and scsi tapsets.
* tapset/task.stp: Used '@defined()' to remove kernel version checks.
* tapset/dentry.stp: Ditto.
* tapset/scsi.stp: Ditto.
Diffstat (limited to 'tapset/dentry.stp')
| -rw-r--r-- | tapset/dentry.stp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tapset/dentry.stp b/tapset/dentry.stp index af8a866f..1d045d02 100644 --- a/tapset/dentry.stp +++ b/tapset/dentry.stp @@ -86,14 +86,12 @@ function reverse_path_walk:string(dentry:long) function d_path:string(nd:long) { root = __dentry_get_current_root() - dentry = %( kernel_vr < "2.6.25" - %? @cast(nd,"nameidata")->dentry - %: @cast(nd,"nameidata")->path->dentry - %) - vfsmnt = %( kernel_vr < "2.6.25" - %? @cast(nd,"nameidata")->mnt - %: @cast(nd,"nameidata")->path->mnt - %) + dentry = (@defined(@cast(nd,"nameidata")->path->dentry) + ? @cast(nd,"nameidata")->path->dentry + : @cast(nd,"nameidata")->dentry) + vfsmnt = (@defined(@cast(nd,"nameidata")->path->mnt) + ? @cast(nd,"nameidata")->path->mnt + : @cast(nd,"nameidata")->mnt) while (1) { if (dentry == @cast(root, "path")->dentry && vfsmnt == @cast(root, "path")->mnt) |