summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2010-04-14 13:08:18 -0400
committerSteve Dickson <steved@redhat.com>2010-04-14 13:08:18 -0400
commitb5e790d3f4a6232c107f17428e9071e9c34fbb9a (patch)
treef3d923139e9b0aa923bcdc768223a6b03cf9c8e9
parenta03d09d23e521eee8941c405710ca19c9c274880 (diff)
parentff7e4908c6de2582bd383bb8490b7cdfa09a5a93 (diff)
downloadsystemtap-b5e790d3f4a6232c107f17428e9071e9c34fbb9a.tar.gz
systemtap-b5e790d3f4a6232c107f17428e9071e9c34fbb9a.tar.xz
systemtap-b5e790d3f4a6232c107f17428e9071e9c34fbb9a.zip
Merge branch 'master' of git://fedorapeople.org/~steved/systemtap
-rw-r--r--nfs/nfs_mount.stp11
-rw-r--r--tapset/nfsmntflags.stp2
2 files changed, 6 insertions, 7 deletions
diff --git a/nfs/nfs_mount.stp b/nfs/nfs_mount.stp
index 32e41f7..940497a 100644
--- a/nfs/nfs_mount.stp
+++ b/nfs/nfs_mount.stp
@@ -1,4 +1,3 @@
-
probe module("nfs").function("nfs_get_sb")
{
printf("nfs_mount: fs_name %s dev %s \n",
@@ -9,7 +8,7 @@ probe module("nfs").function("nfs_get_sb")
probe module("nfs").function("nfs_get_sb").return
{
if ($return)
- printf("nfs_mount: ERROR %d (%s)", $return, errno_str($return));
+ printf("nfs_mount: ERROR %d (%s)\n", $return, errno_str($return));
}
/*
probe module("nfs").function("nfs_validate_mount_data")
@@ -19,12 +18,12 @@ probe module("nfs").function("nfs_validate_mount_data")
printf(" : flags=[%s]\n", nfs_mntflags($raw_data));
}
+*/
probe module("nfs").function("nfs_validate_mount_data").return
{
if ($return)
- printf(" nfs_validate_mount_data: ERROR %d (%s)", $return, errno_str($return));
+ printf(" nfs_validate_mount_data: ERROR %d (%s)\n", $return, errno_str($return));
}
-*/
probe module("nfs").function("nfs_parse_mount_options")
{
printf(" nfs_parse_mount_options: raw [%s]\n", kernel_string($raw));
@@ -37,7 +36,7 @@ probe module("nfs").function("nfs_parse_mount_options").return
probe module("nfs").function("nfs_parse_devname").return
{
if ($return)
- printf(" nfs_parse_devname: ERROR %d (%s)", $return, errno_str($return));
+ printf(" nfs_parse_devname: ERROR %d (%s)\n", $return, errno_str($return));
}
/*
probe module("nfs").function("nfs_try_mount")
@@ -52,7 +51,7 @@ probe module("nfs").function("nfs_mount")
probe module("nfs").function("nfs_mount").return
{
if ($return)
- printf(" nfs_mount: ERROR %d (%s)", $return, errno_str($return));
+ printf(" nfs_mount: ERROR %d (%s)\n", $return, errno_str($return));
}
probe module("nfs").function("nfs_get_root")
{
diff --git a/tapset/nfsmntflags.stp b/tapset/nfsmntflags.stp
index 62519c1..f551806 100644
--- a/tapset/nfsmntflags.stp
+++ b/tapset/nfsmntflags.stp
@@ -9,7 +9,7 @@
%}
function nfs_mntflags:string(rawdata)
%{
- char buf[1024], *ptr;
+ char buf[64], *ptr;
int i, cc;
static struct proc_nfs_info {
int flag;