summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemyslaw@pawelczyk.it>2009-10-13 03:23:45 +0200
committerJosh Stone <jistone@redhat.com>2009-10-13 12:25:36 -0700
commitb45283807e0fd961447cd5aa91d1fbff98e1940a (patch)
treee4743731f0cbd81664f88e7e349930f3facbf879
parent784a7d570306d7601a7338c95226a49dec156398 (diff)
downloadsystemtap-steved-b45283807e0fd961447cd5aa91d1fbff98e1940a.tar.gz
systemtap-steved-b45283807e0fd961447cd5aa91d1fbff98e1940a.tar.xz
systemtap-steved-b45283807e0fd961447cd5aa91d1fbff98e1940a.zip
PR5434: Fix syscall.nfsservctl.
Use proper $vars according to CONFIG_NFSD and CONFIG_COMPAT in syscall.nfsservctl and mask it out along with return probe if CONFIG_NFSD != "[ym]" && CONFIG_COMPAT != "y". * tapset/syscalls2.stp (syscall.nfsservctl): Fix it.
-rw-r--r--tapset/syscalls2.stp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 5e97aef5..47aba9b4 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -61,14 +61,21 @@ probe syscall.compat_nanosleep.return = kernel.function("compat_sys_nanosleep").
# long compat_sys_nfsservctl(int cmd, struct compat_nfsctl_arg __user *arg,
# union compat_nfsctl_res __user *res)
#
+%( CONFIG_NFSD == "[ym]" || CONFIG_COMPAT == "y" %?
probe syscall.nfsservctl = kernel.function("sys_nfsservctl").call ?,
kernel.function("compat_sys_nfsservctl").call ?
{
name = "nfsservctl"
cmd = $cmd
+%( CONFIG_NFSD == "[ym]" %?
argp_uaddr = $arg
resp_uaddr = $res
argstr = sprintf("%s, %p, %p", _nfsctl_cmd_str($cmd), $arg, $res)
+%:
+ argp_uaddr = $notused
+ resp_uaddr = $notused2
+ argstr = sprintf("/* NI_SYSCALL */ %s, %p, %p", _nfsctl_cmd_str($cmd), $notused, $notused2)
+%)
}
probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return ?,
kernel.function("compat_sys_nfsservctl").return ?
@@ -76,6 +83,7 @@ probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return ?,
name = "nfsservctl"
retstr = returnstr(1)
}
+%)
# nice _______________________________________________________
# long sys_nice(int increment)