diff options
| author | Steve Dickson <steved@redhat.com> | 2010-04-14 13:06:43 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-04-14 13:06:43 -0400 |
| commit | a03d09d23e521eee8941c405710ca19c9c274880 (patch) | |
| tree | 61203011ba7334966dc7da1b248f7e64b4fd4a2f | |
| parent | 226be5a31b0240657fa7c5cb57e84f876d697d2c (diff) | |
| download | systemtap-a03d09d23e521eee8941c405710ca19c9c274880.tar.gz systemtap-a03d09d23e521eee8941c405710ca19c9c274880.tar.xz systemtap-a03d09d23e521eee8941c405710ca19c9c274880.zip | |
Ported the code to the 2.6.32 kernel
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | nfsd/nfsd_permission.stp | 20 | ||||
| -rw-r--r-- | tapset/nfs4_callback.stp | 4 | ||||
| -rw-r--r-- | tapset/nfs4ops.stp | 4 | ||||
| -rw-r--r-- | tapset/nfsd4_secinfo.stp | 2 | ||||
| -rw-r--r-- | tapset/nfsd_fh.stp | 2 | ||||
| -rw-r--r-- | tapset/svc_export.stp | 2 |
6 files changed, 29 insertions, 5 deletions
diff --git a/nfsd/nfsd_permission.stp b/nfsd/nfsd_permission.stp index 6025c05..1b77df1 100644 --- a/nfsd/nfsd_permission.stp +++ b/nfsd/nfsd_permission.stp @@ -7,10 +7,26 @@ probe module("nfsd").function("nfsd_permission") printf(" : %s\n", svc_export_dump($exp)); } %( kernel_v >= "2.6.25" %? -probe kernel.function("inode_permission").return +probe kernel.function("acl_permission_check").return { if ($return) - printf(" inode_permission: error: %d\n", $return); + printf(" acl_permission_check: error: %d\n", $return); +} +/* + a very busy probe +probe kernel.function("selinux_inode_permission").return +{ + if ($return) + printf(" selinux_inode_permission: error: %d\n", $return); + +} +*/ +probe kernel.function("inode_permission").return +{ + if ($return) + printf(" inode_permission: uid %d gid %d: mode 0%o: flags 0x%x: mask 0x%x: error: %d\n", + $inode->i_uid, $inode->i_gid, $inode->i_mode, $inode->i_flags, + $mask, $return); } probe kernel.function("security_inode_permission").return { diff --git a/tapset/nfs4_callback.stp b/tapset/nfs4_callback.stp index 01070e1..c6492b7 100644 --- a/tapset/nfs4_callback.stp +++ b/tapset/nfs4_callback.stp @@ -8,9 +8,11 @@ #include <linux/nfs4.h> #include <linux/nfsd/nfsfh.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) #include <linux/nfsd/state.h> -#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr4.h> +#endif +#include <linux/nfsd/nfsd.h> %} function nfs4_callback:string(_stp:long) diff --git a/tapset/nfs4ops.stp b/tapset/nfs4ops.stp index 07fc53a..c09be6a 100644 --- a/tapset/nfs4ops.stp +++ b/tapset/nfs4ops.stp @@ -9,9 +9,11 @@ #include <linux/nfs4.h> #include <linux/nfsd/nfsfh.h> #include <linux/nfsd/export.h> -#include <linux/nfsd/state.h> #include <linux/nfsd/nfsd.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) +#include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> +#endif %} function nfs4ops:string(_compars:long) diff --git a/tapset/nfsd4_secinfo.stp b/tapset/nfsd4_secinfo.stp index 69ae6c2..bdedcce 100644 --- a/tapset/nfsd4_secinfo.stp +++ b/tapset/nfsd4_secinfo.stp @@ -5,8 +5,10 @@ #include <linux/nfsd/nfsd.h> #include <linux/nfsd/export.h> #include <linux/nfsd/nfsfh.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) #include <linux/nfsd/state.h> #include <linux/nfsd/xdr4.h> +#endif %} function nfsd4_secinfo_dump:string(_secinfo:long) diff --git a/tapset/nfsd_fh.stp b/tapset/nfsd_fh.stp index ef1d7a3..8ea5d0e 100644 --- a/tapset/nfsd_fh.stp +++ b/tapset/nfsd_fh.stp @@ -3,10 +3,12 @@ #include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsfh.h> #include <linux/nfsd/export.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) #include <linux/nfsd/state.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) #include <linux/nfsd/xdr4.h> #endif +#endif %} diff --git a/tapset/svc_export.stp b/tapset/svc_export.stp index 6ab1a04..f67f6e0 100644 --- a/tapset/svc_export.stp +++ b/tapset/svc_export.stp @@ -5,8 +5,8 @@ #else #include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsfh.h> -#include <linux/nfsd/export.h> #endif +#include <linux/nfsd/export.h> %} function svc_export_dump:string(_exp:long) |