diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-04-25 16:33:24 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-04-25 16:33:24 -0400 |
| commit | 76d647dc1fdf1d6bb4397f4a3b819003492dfda6 (patch) | |
| tree | 51b9d7a1f0ee75a41c487828d5e62c6a70b7fd28 /runtime/task_finder.c | |
| parent | c47ccf304e6560cb50c86c2a5213c8de56678449 (diff) | |
| parent | 9f99b110fbee8a6935ca60c152cc3c7cd809461b (diff) | |
| download | systemtap-steved-76d647dc1fdf1d6bb4397f4a3b819003492dfda6.tar.gz systemtap-steved-76d647dc1fdf1d6bb4397f4a3b819003492dfda6.tar.xz systemtap-steved-76d647dc1fdf1d6bb4397f4a3b819003492dfda6.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap into pr6429-comp-unwindsyms
* 'master' of ssh://sources.redhat.com/git/systemtap:
simplify systemtap.spec configuration vars
Handles markers with no format string.
Fixed task_finder.c kernel 2.6.25 change.
PR6454: fix "stap -l" listing of space-laden probe point names
Move examples to testsuite/systemtap.examples.
PR6451: avoid one class of staprun shutdown deadlock (module/.ctl filehandle = 0)
Made kernel 2.6.25 changes in task_finder.c.
Move examples to testsuite/systemtap.examples
PR6416: extend probing blacklist with more init/exit sections
Diffstat (limited to 'runtime/task_finder.c')
| -rw-r--r-- | runtime/task_finder.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/runtime/task_finder.c b/runtime/task_finder.c index d0a9a40f..aafe9c32 100644 --- a/runtime/task_finder.c +++ b/runtime/task_finder.c @@ -153,11 +153,12 @@ __stp_get_mm_path(struct mm_struct *mm, char *buf, int buflen) vma = vma->vm_next; } if (vma) { - struct vfsmount *mnt = mntget(vma->vm_file->f_vfsmnt); - struct dentry *dentry = dget(vma->vm_file->f_dentry); - rc = d_path(dentry, mnt, buf, buflen); - dput(dentry); - mntput(mnt); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) + rc = d_path(vma->vm_file->f_dentry, vma->vm_file->f_vfsmnt, + buf, buflen); +#else + rc = d_path(&(vma->vm_file->f_path), buf, buflen); +#endif } else { *buf = '\0'; |