Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

* 'master' of ssh://sources.redhat.com/git/systemtap:
  Made kernel 2.6.25 changes in task_finder.c.
  Move examples to testsuite/systemtap.examples

46 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';
diff --git a/examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 78083901..78083901 100644
--- a/examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
diff --git a/examples/README b/testsuite/systemtap.examples/README
index 6718a55a..6718a55a 100644
--- a/examples/README
+++ b/testsuite/systemtap.examples/README
diff --git a/examples/futexes.stp b/testsuite/systemtap.examples/futexes.stp
index 16c62937..16c62937 100755
--- a/examples/futexes.stp
+++ b/testsuite/systemtap.examples/futexes.stp
diff --git a/examples/futexes.txt b/testsuite/systemtap.examples/futexes.txt
index 51de4352..51de4352 100644
--- a/examples/futexes.txt
+++ b/testsuite/systemtap.examples/futexes.txt
diff --git a/examples/helloworld.stp b/testsuite/systemtap.examples/helloworld.stp
index efe45b79..efe45b79 100755
--- a/examples/helloworld.stp
+++ b/testsuite/systemtap.examples/helloworld.stp
diff --git a/examples/iostat-scsi.stp b/testsuite/systemtap.examples/iostat-scsi.stp
index ef778e53..ef778e53 100755
--- a/examples/iostat-scsi.stp
+++ b/testsuite/systemtap.examples/iostat-scsi.stp
diff --git a/examples/iostat-scsi.txt b/testsuite/systemtap.examples/iostat-scsi.txt
index 8222f659..8222f659 100644
--- a/examples/iostat-scsi.txt
+++ b/testsuite/systemtap.examples/iostat-scsi.txt
diff --git a/examples/iotime.stp b/testsuite/systemtap.examples/iotime.stp
index a5b36449..a5b36449 100755
--- a/examples/iotime.stp
+++ b/testsuite/systemtap.examples/iotime.stp
diff --git a/examples/nettop.stp b/testsuite/systemtap.examples/nettop.stp
index 96db413a..96db413a 100755
--- a/examples/nettop.stp
+++ b/testsuite/systemtap.examples/nettop.stp
diff --git a/examples/nettop.txt b/testsuite/systemtap.examples/nettop.txt
index 2bfd4967..2bfd4967 100644
--- a/examples/nettop.txt
+++ b/testsuite/systemtap.examples/nettop.txt
diff --git a/examples/pf2.stp b/testsuite/systemtap.examples/pf2.stp
index 96fdb7e7..96fdb7e7 100755
--- a/examples/pf2.stp
+++ b/testsuite/systemtap.examples/pf2.stp
diff --git a/examples/pf2.txt b/testsuite/systemtap.examples/pf2.txt
index 0fafe17e..0fafe17e 100644
--- a/examples/pf2.txt
+++ b/testsuite/systemtap.examples/pf2.txt
diff --git a/examples/sig_by_pid.stp b/testsuite/systemtap.examples/sig_by_pid.stp
index 9c1493f5..9c1493f5 100755
--- a/examples/sig_by_pid.stp
+++ b/testsuite/systemtap.examples/sig_by_pid.stp
diff --git a/examples/sig_by_pid.txt b/testsuite/systemtap.examples/sig_by_pid.txt
index 927b4607..927b4607 100644
--- a/examples/sig_by_pid.txt
+++ b/testsuite/systemtap.examples/sig_by_pid.txt
diff --git a/examples/sig_by_proc.stp b/testsuite/systemtap.examples/sig_by_proc.stp
index ce845aed..ce845aed 100755
--- a/examples/sig_by_proc.stp
+++ b/testsuite/systemtap.examples/sig_by_proc.stp
diff --git a/examples/sig_by_proc.txt b/testsuite/systemtap.examples/sig_by_proc.txt
index d09da9fe..d09da9fe 100644
--- a/examples/sig_by_proc.txt
+++ b/testsuite/systemtap.examples/sig_by_proc.txt
diff --git a/examples/sigmon.stp b/testsuite/systemtap.examples/sigmon.stp
index 31d7822e..31d7822e 100755
--- a/examples/sigmon.stp
+++ b/testsuite/systemtap.examples/sigmon.stp
diff --git a/examples/sleeptime.stp b/testsuite/systemtap.examples/sleeptime.stp
index 252e50cc..252e50cc 100755
--- a/examples/sleeptime.stp
+++ b/testsuite/systemtap.examples/sleeptime.stp
diff --git a/examples/small_demos/ansi_colors.stp b/testsuite/systemtap.examples/small_demos/ansi_colors.stp
index 0d9d7c47..0d9d7c47 100755
--- a/examples/small_demos/ansi_colors.stp
+++ b/testsuite/systemtap.examples/small_demos/ansi_colors.stp
diff --git a/examples/small_demos/click.wav b/testsuite/systemtap.examples/small_demos/click.wav
index 8214b229..8214b229 100644
--- a/examples/small_demos/click.wav
+++ b/testsuite/systemtap.examples/small_demos/click.wav
diff --git a/examples/small_demos/close.stp b/testsuite/systemtap.examples/small_demos/close.stp
index 7ba2a036..7ba2a036 100755
--- a/examples/small_demos/close.stp
+++ b/testsuite/systemtap.examples/small_demos/close.stp
diff --git a/examples/small_demos/demo_script.txt b/testsuite/systemtap.examples/small_demos/demo_script.txt
index f3166a49..f3166a49 100644
--- a/examples/small_demos/demo_script.txt
+++ b/testsuite/systemtap.examples/small_demos/demo_script.txt
diff --git a/examples/small_demos/fileopen.stp b/testsuite/systemtap.examples/small_demos/fileopen.stp
index c1298f9c..c1298f9c 100755
--- a/examples/small_demos/fileopen.stp
+++ b/testsuite/systemtap.examples/small_demos/fileopen.stp
diff --git a/examples/small_demos/key.stp b/testsuite/systemtap.examples/small_demos/key.stp
index 6d2d6c3f..6d2d6c3f 100755
--- a/examples/small_demos/key.stp
+++ b/testsuite/systemtap.examples/small_demos/key.stp
diff --git a/examples/small_demos/keyhack.stp b/testsuite/systemtap.examples/small_demos/keyhack.stp
index 3137baad..3137baad 100755
--- a/examples/small_demos/keyhack.stp
+++ b/testsuite/systemtap.examples/small_demos/keyhack.stp
diff --git a/examples/small_demos/kmalloc.stp b/testsuite/systemtap.examples/small_demos/kmalloc.stp
index 9157928d..9157928d 100755
--- a/examples/small_demos/kmalloc.stp
+++ b/testsuite/systemtap.examples/small_demos/kmalloc.stp
diff --git a/examples/small_demos/kmalloc2.stp b/testsuite/systemtap.examples/small_demos/kmalloc2.stp
index 2622dd2f..2622dd2f 100755
--- a/examples/small_demos/kmalloc2.stp
+++ b/testsuite/systemtap.examples/small_demos/kmalloc2.stp
diff --git a/examples/small_demos/proc_snoop.stp b/testsuite/systemtap.examples/small_demos/proc_snoop.stp
index 24499b4b..24499b4b 100755
--- a/examples/small_demos/proc_snoop.stp
+++ b/testsuite/systemtap.examples/small_demos/proc_snoop.stp
diff --git a/examples/small_demos/prof.stp b/testsuite/systemtap.examples/small_demos/prof.stp
index 389f743a..389f743a 100755
--- a/examples/small_demos/prof.stp
+++ b/testsuite/systemtap.examples/small_demos/prof.stp
diff --git a/examples/small_demos/return.wav b/testsuite/systemtap.examples/small_demos/return.wav
index 20f978cc..20f978cc 100644
--- a/examples/small_demos/return.wav
+++ b/testsuite/systemtap.examples/small_demos/return.wav
diff --git a/examples/small_demos/rwtiming.stp b/testsuite/systemtap.examples/small_demos/rwtiming.stp
index d570c581..d570c581 100755
--- a/examples/small_demos/rwtiming.stp
+++ b/testsuite/systemtap.examples/small_demos/rwtiming.stp
diff --git a/examples/small_demos/sched_snoop.stp b/testsuite/systemtap.examples/small_demos/sched_snoop.stp
index 623643dd..623643dd 100755
--- a/examples/small_demos/sched_snoop.stp
+++ b/testsuite/systemtap.examples/small_demos/sched_snoop.stp
diff --git a/examples/small_demos/sys.stp b/testsuite/systemtap.examples/small_demos/sys.stp
index 2df20bc3..2df20bc3 100755
--- a/examples/small_demos/sys.stp
+++ b/testsuite/systemtap.examples/small_demos/sys.stp
diff --git a/examples/small_demos/top.stp b/testsuite/systemtap.examples/small_demos/top.stp
index b46b9940..b46b9940 100755
--- a/examples/small_demos/top.stp
+++ b/testsuite/systemtap.examples/small_demos/top.stp
diff --git a/examples/socket-trace.stp b/testsuite/systemtap.examples/socket-trace.stp
index 13ab8e06..13ab8e06 100755
--- a/examples/socket-trace.stp
+++ b/testsuite/systemtap.examples/socket-trace.stp
diff --git a/examples/socktop b/testsuite/systemtap.examples/socktop
index 123e37e9..123e37e9 100755
--- a/examples/socktop
+++ b/testsuite/systemtap.examples/socktop
diff --git a/examples/socktop.txt b/testsuite/systemtap.examples/socktop.txt
index 0ebce003..0ebce003 100644
--- a/examples/socktop.txt
+++ b/testsuite/systemtap.examples/socktop.txt
diff --git a/examples/syscalls_by_pid.stp b/testsuite/systemtap.examples/syscalls_by_pid.stp
index 47aa4955..47aa4955 100755
--- a/examples/syscalls_by_pid.stp
+++ b/testsuite/systemtap.examples/syscalls_by_pid.stp
diff --git a/examples/syscalls_by_pid.txt b/testsuite/systemtap.examples/syscalls_by_pid.txt
index 4943a139..4943a139 100644
--- a/examples/syscalls_by_pid.txt
+++ b/testsuite/systemtap.examples/syscalls_by_pid.txt
diff --git a/examples/syscalls_by_proc.stp b/testsuite/systemtap.examples/syscalls_by_proc.stp
index af7d6932..af7d6932 100755
--- a/examples/syscalls_by_proc.stp
+++ b/testsuite/systemtap.examples/syscalls_by_proc.stp
diff --git a/examples/syscalls_by_proc.txt b/testsuite/systemtap.examples/syscalls_by_proc.txt
index dd554083..dd554083 100644
--- a/examples/syscalls_by_proc.txt
+++ b/testsuite/systemtap.examples/syscalls_by_proc.txt
diff --git a/examples/syscalltimes b/testsuite/systemtap.examples/syscalltimes
index 84ca77a9..84ca77a9 100755
--- a/examples/syscalltimes
+++ b/testsuite/systemtap.examples/syscalltimes
diff --git a/examples/syscalltimes.txt b/testsuite/systemtap.examples/syscalltimes.txt
index d50f73ad..d50f73ad 100644
--- a/examples/syscalltimes.txt
+++ b/testsuite/systemtap.examples/syscalltimes.txt
diff --git a/examples/wait4time.stp b/testsuite/systemtap.examples/wait4time.stp
index 568239b9..568239b9 100755
--- a/examples/wait4time.stp
+++ b/testsuite/systemtap.examples/wait4time.stp