fix syscall.lstat, syscall.lstat64, syscall.newlstat.

fix syscall.compat_sys_statfs and syscall.sys32_open in ppc64/syscalls.stp

4 files changed, 22 insertions, 15 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index ee7252f7..3c87534f 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,5 +1,12 @@
 2006-07-04  Li Guanglei <guanglei@cn.ibm.com>
 	
+	* syscalls.stp, syscalls2.stp, ppc64/syscalls.stp: 
+	fix syscall.lstat, syscall.lstat64, syscall.newlstat. 
+	* ppc64/syscalls.stp: fix syscall.compat_sys_statfs and 
+	syscall.sys32_open
+
+2006-07-04  Li Guanglei <guanglei@cn.ibm.com>
+	
 	* memory.stp: add addr_to_node() from Jose R. Santos
 	(jrs@us.ibm.com)
 	* syscalls.stp: typo for syscall.lstat
diff --git a/tapset/ppc64/syscalls.stp b/tapset/ppc64/syscalls.stp
index be753dc9..b487fbc8 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/ppc64/syscalls.stp
@@ -333,7 +333,7 @@ probe syscall.compat_sys_statfs = kernel.function("compat_sys_statfs") {
 	argstr = sprintf("%s, [%p]", path, buf_uaddr)
 }
 probe syscall.compat_sys_statfs.return =
-	kernel.function("statfs").return {
+	kernel.function("compat_sys_statfs").return {
 	name = "compat_sys_statfs"
 	retstr = returnstr(1)
 }
@@ -355,16 +355,16 @@ probe syscall.compat_sys_fstatfs.return =
 }
 # lstat ______________________________________________________
 # long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
-probe syscall.lstat = kernel.function("sys_lstat") ?,
+probe syscall.lstat64 = 
 		kernel.function("sys_lstat64") ? {
-	name = "lstat"
+	name = "lstat64"
 	file_name = user_string($filename)
 	buf_uaddr = $statbuf
 	argstr = sprintf("%s, [%p]", file_name, buf_uaddr)
 }
-probe syscall.lstat.return = kernel.function("sys_lstat").return ?,
+probe syscall.lstat64.return = 
 		kernel.function("sys_lstat64").return ? {
-	name = "lstat"
+	name = "lstat64"
 	retstr = returnstr(1)
 }
 
@@ -1002,7 +1002,7 @@ probe syscall.acct.return = kernel.function("sys_acct").return ? {
 
 #sys32_open _______________________________________________________
 # asmlinkage long sys32_open(const char * filename, int flags, int mode)
-probe syscall.sys32_open = kernel.function("sys32_open") {
+probe syscall.sys32_open = kernel.function("sys32_open") ? {
 	name = "open"
 	filename_uaddr = $filename
 	filename = user_string($filename)
@@ -1013,7 +1013,7 @@ probe syscall.sys32_open = kernel.function("sys32_open") {
 	else
 	argstr = sprintf("[0x%x]:\"%s\", %s", filename_uaddr, filename, _sys_open_flag_str(flags))
 }
-probe syscall.sys32_open.return = kernel.function("sys32_open").return {
+probe syscall.sys32_open.return = kernel.function("sys32_open").return ? {
 	name = "open"
 	retstr = returnstr(1)
 }
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index 7a1616d8..06e88e17 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -1647,8 +1647,7 @@ probe kernel.syscall.lsetxattr.return =
 # lstat ______________________________________________________
 # long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
 probe syscall.lstat = 
-		kernel.function("sys_lstat") ?, 
-		kernel.function("compat_sys_newlstat") ? 
+		kernel.function("sys_lstat") ?
 {
 	name = "lstat"
 	file_name = user_string($filename)
@@ -1656,8 +1655,7 @@ probe syscall.lstat =
 	argstr = sprintf("\"%s\", [%p]", file_name, buf_uaddr) 
 }
 probe syscall.lstat.return = 
-		kernel.function("sys_lstat").return ?,
-		kernel.function("compat_sys_newlstat").return ?
+		kernel.function("sys_lstat").return ?
 { 
 	name = "lstat"
 	retstr = returnstr(1)
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 80b2aa71..7d4a7c68 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -41,14 +41,16 @@ probe syscall.nanosleep.return = kernel.function("sys_nanosleep").return {
 # long sys_newlstat(char __user * filename,
 #		  struct stat __user * statbuf)
 #
-probe syscall.newlstat = kernel.function("sys_newlstat") {
-	name = "lstat"
+probe syscall.newlstat = kernel.function("sys_newlstat") ?,
+	kernel.function("compat_sys_newlstat") ?  {
+	name = "newlstat"
 	pathname = user_string($filename)
 	buf_uaddr = $statbuf
 	argstr = sprintf("\"%s\", [%p]", pathname, buf_uaddr)  
 }
-probe syscall.newlstat.return = kernel.function("sys_newlstat").return {
-	name = "lstat"
+probe syscall.newlstat.return = kernel.function("sys_newlstat").return ?,
+	kernel.function("compat_sys_newlstat").return ?  {
+	name = "newlstat"
 	retstr = returnstr(1)
 }
 # newstat ____________________________________________________