From: William Cohen <wcohen@redhat.com>
Date: Thu, 15 Feb 2024 20:01:53 +0000 (-0500)
Subject: PR19360: Correct lwtools fslatency-nd.stp and fsslower-nd.stp
X-Git-Tag: release-5.1~38
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=01261944787df5c757d55fe2ec081b70a1723ab0;p=systemtap.git

PR19360: Correct lwtools fslatency-nd.stp and fsslower-nd.stp

Reviewed examples to ensure that the entry value for a function
argument is used for function return probes. Found that
__vfs_write.return probes aliases were missing ".return" and needed an
@entry() for the argument fetch in fslatency-nd.stp and
fsslower-nd.stp.
---

diff --git a/testsuite/systemtap.examples/lwtools/fslatency-nd.stp b/testsuite/systemtap.examples/lwtools/fslatency-nd.stp
index 0bee34f2f..fdd8e99a2 100755
--- a/testsuite/systemtap.examples/lwtools/fslatency-nd.stp
+++ b/testsuite/systemtap.examples/lwtools/fslatency-nd.stp
@@ -111,10 +111,10 @@ probe write_funcs.return = kprobe.function("do_sync_write").return !,
 			   __vfs_write.return
 {
 }
-probe __vfs_write.return = kprobe.function("__vfs_write")
+probe __vfs_write.return = kprobe.function("__vfs_write").return
 {
 	# Skip the call if new_sync_write() wouldn't be called.
-	file = pointer_arg(1)
+	file = @entry(pointer_arg(1))
 	if (!file || @cast(file, "file", "kernel")->f_op->write
 	    || !@cast(file, "file", "kernel")->f_op->write_iter)
 		next
diff --git a/testsuite/systemtap.examples/lwtools/fsslower-nd.stp b/testsuite/systemtap.examples/lwtools/fsslower-nd.stp
index 90fa9b54d..e89784eee 100755
--- a/testsuite/systemtap.examples/lwtools/fsslower-nd.stp
+++ b/testsuite/systemtap.examples/lwtools/fsslower-nd.stp
@@ -119,10 +119,10 @@ probe write_funcs.return = kprobe.function("do_sync_write").return !,
 			   __vfs_write.return
 {
 }
-probe __vfs_write.return = kprobe.function("__vfs_write")
+probe __vfs_write.return = kprobe.function("__vfs_write").return
 {
 	# Skip the call if new_sync_write() wouldn't be called.
-	file = pointer_arg(1)
+	file = @entry(pointer_arg(1))
 	if (!file || @cast(file, "file", "kernel")->f_op->write
 	    || !@cast(file, "file", "kernel")->f_op->write_iter)
 		next