diff options
| author | William Cohen <wcohen@localhost.localdomain> | 2008-04-24 13:53:45 -0400 |
|---|---|---|
| committer | William Cohen <wcohen@localhost.localdomain> | 2008-04-24 13:53:45 -0400 |
| commit | 478e10649195945adf7153fe5254932df1e2a902 (patch) | |
| tree | d3a957dad0c9b85244efe015d1682a684e3c0e47 | |
| parent | 7f79ea13a0f64573ce13353257d322ae49ef0c27 (diff) | |
| parent | 11d7b3fe654ad5f97479b803b79a0e1fde4e33b5 (diff) | |
| download | systemtap-steved-478e10649195945adf7153fe5254932df1e2a902.tar.gz systemtap-steved-478e10649195945adf7153fe5254932df1e2a902.tar.xz systemtap-steved-478e10649195945adf7153fe5254932df1e2a902.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
| -rw-r--r-- | runtime/ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/task_finder.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index e3c1ea8d..9197f4ec 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,7 @@ +2008-04-24 David Smith <dsmith@redhat.com> + + * task_finder.c (__stp_get_mm_path): Made kernel 2.6.25 changes. + 2008-04-16 David Smith <dsmith@redhat.com> * task_finder.c (__stp_get_mm_path): Made kernel 2.6.18 changes. diff --git a/runtime/task_finder.c b/runtime/task_finder.c index d0a9a40f..ffbc3d0c 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, buf, buflen); +#endif } else { *buf = '\0'; |