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 0bee34f2faa975048fd0b68019814770292daa03..fdd8e99a2a8cd7382052ba108acdc1fc1e420449 100755 (executable)
--- 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 90fa9b54debdf4bdb2c50d63000b972f214b6b73..e89784eeef2b893c67fb519910d2a67a60ecd63c 100755 (executable)
--- 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