Tweak kernel or module resident probe

* tapset/nfs_proc.stp: Change '?' notation to "!".
* tapset/nfsd.stp: Ditto.
* tapset/scsi.stp: Ditto.

3 files changed, 132 insertions, 132 deletions

diff --git a/tapset/nfs_proc.stp b/tapset/nfs_proc.stp
index e3d9a78f..502091b4 100644
--- a/tapset/nfs_proc.stp
+++ b/tapset/nfs_proc.stp
@@ -270,7 +270,7 @@ probe nfs.proc.lookup.return = nfs.proc2.lookup.return,
                                nfs.proc4.lookup.return
 {}
 
-probe nfs.proc2.lookup = kernel.function("nfs_proc_lookup")?,
+probe nfs.proc2.lookup = kernel.function("nfs_proc_lookup")!,
                          module("nfs").function("nfs_proc_lookup")?
 {
 	server_ip = __i2n_ip_proto($dir,0)
@@ -284,7 +284,7 @@ probe nfs.proc2.lookup = kernel.function("nfs_proc_lookup")?,
         argstr = sprintf("%s",filename) 
 }
 
-probe nfs.proc2.lookup.return = kernel.function("nfs_proc_lookup").return?,
+probe nfs.proc2.lookup.return = kernel.function("nfs_proc_lookup").return!,
                                 module("nfs").function("nfs_proc_lookup").return?
 {
         version =2
@@ -292,7 +292,7 @@ probe nfs.proc2.lookup.return = kernel.function("nfs_proc_lookup").return?,
 	retstr = sprintf("%d", $return)
 }
 
-probe nfs.proc3.lookup = kernel.function("nfs3_proc_lookup")?,
+probe nfs.proc3.lookup = kernel.function("nfs3_proc_lookup")!,
                          module("nfs").function("nfs3_proc_lookup")?
 {
 
@@ -308,7 +308,7 @@ probe nfs.proc3.lookup = kernel.function("nfs3_proc_lookup")?,
 }
 
 
-probe nfs.proc3.lookup.return = kernel.function("nfs3_proc_lookup").return?,
+probe nfs.proc3.lookup.return = kernel.function("nfs3_proc_lookup").return!,
                                 module("nfs").function("nfs3_proc_lookup").return?
 {
         version =3
@@ -316,7 +316,7 @@ probe nfs.proc3.lookup.return = kernel.function("nfs3_proc_lookup").return?,
 	retstr = sprintf("%d", $return)
 }
 
-probe nfs.proc4.lookup = kernel.function("nfs4_proc_lookup")?,
+probe nfs.proc4.lookup = kernel.function("nfs4_proc_lookup")!,
                          module("nfs").function("nfs4_proc_lookup")?
 {
 
@@ -333,7 +333,7 @@ probe nfs.proc4.lookup = kernel.function("nfs4_proc_lookup")?,
         argstr = sprintf("%s",filename) 
 }
 
-probe nfs.proc4.lookup.return = kernel.function("nfs4_proc_lookup").return?,
+probe nfs.proc4.lookup.return = kernel.function("nfs4_proc_lookup").return!,
                                 module("nfs").function("nfs4_proc_lookup").return?
 {
         version =4
@@ -368,7 +368,7 @@ probe nfs.proc.read.return = nfs.proc2.read.return ,
 {
 }
 
-probe nfs.proc2.read = kernel.function("nfs_proc_read") ?,
+probe nfs.proc2.read = kernel.function("nfs_proc_read") !,
                        module("nfs").function("nfs_proc_read")?
 {
 	server_ip = __nfs_read_data_info($rdata,0)
@@ -386,7 +386,7 @@ probe nfs.proc2.read = kernel.function("nfs_proc_read") ?,
         units = "bytes"
 }
 
-probe nfs.proc2.read.return = kernel.function("nfs_proc_read").return ?,
+probe nfs.proc2.read.return = kernel.function("nfs_proc_read").return !,
                        module("nfs").function("nfs_proc_read").return?
 {
         version =2
@@ -395,7 +395,7 @@ probe nfs.proc2.read.return = kernel.function("nfs_proc_read").return ?,
 }
 
 
-probe nfs.proc3.read = kernel.function("nfs3_proc_read") ?,
+probe nfs.proc3.read = kernel.function("nfs3_proc_read") !,
                        module("nfs").function("nfs3_proc_read")?
 {
 	server_ip = __nfs_read_data_info($rdata,0)
@@ -413,7 +413,7 @@ probe nfs.proc3.read = kernel.function("nfs3_proc_read") ?,
         units = "bytes"
 }
 
-probe nfs.proc3.read.return = kernel.function("nfs3_proc_read").return ?,
+probe nfs.proc3.read.return = kernel.function("nfs3_proc_read").return !,
                        module("nfs").function("nfs3_proc_read").return?
 {
         version =3
@@ -421,7 +421,7 @@ probe nfs.proc3.read.return = kernel.function("nfs3_proc_read").return ?,
         retstr = sprintf("%d", $return)
 }
 
-probe nfs.proc4.read = kernel.function("nfs4_proc_read") ?,
+probe nfs.proc4.read = kernel.function("nfs4_proc_read") !,
                        module("nfs").function("nfs4_proc_read")?
 {
 	server_ip = __nfs_read_data_info($rdata,0)
@@ -439,7 +439,7 @@ probe nfs.proc4.read = kernel.function("nfs4_proc_read") ?,
         units = "bytes"
 }
 
-probe nfs.proc4.read.return = kernel.function("nfs4_proc_read").return ?,
+probe nfs.proc4.read.return = kernel.function("nfs4_proc_read").return !,
                        module("nfs").function("nfs4_proc_read").return?
 {
         version =4
@@ -477,7 +477,7 @@ probe nfs.proc.write.return = nfs.proc2.write.return ,
                       nfs.proc4.write.return 
 {}
 
-probe nfs.proc2.write = kernel.function("nfs_proc_write")?,
+probe nfs.proc2.write = kernel.function("nfs_proc_write")!,
                         module("nfs").function("nfs_proc_write")?
 {
       
@@ -496,7 +496,7 @@ probe nfs.proc2.write = kernel.function("nfs_proc_write")?,
         units = "bytes"
 }
 
-probe nfs.proc2.write.return = kernel.function("nfs_proc_write").return ?,
+probe nfs.proc2.write.return = kernel.function("nfs_proc_write").return !,
                        module("nfs").function("nfs_proc_write").return?
 {
         version =2
@@ -510,7 +510,7 @@ probe nfs.proc2.write.return = kernel.function("nfs_proc_write").return ?,
 }
 
 
-probe nfs.proc3.write = kernel.function("nfs3_proc_write")?,
+probe nfs.proc3.write = kernel.function("nfs3_proc_write")!,
                         module("nfs").function("nfs3_proc_write")?
 {
       
@@ -530,7 +530,7 @@ probe nfs.proc3.write = kernel.function("nfs3_proc_write")?,
 }
 
 
-probe nfs.proc3.write.return = kernel.function("nfs3_proc_write").return ?,
+probe nfs.proc3.write.return = kernel.function("nfs3_proc_write").return !,
                        module("nfs").function("nfs3_proc_write").return?
 {
         version =3
@@ -545,7 +545,7 @@ probe nfs.proc3.write.return = kernel.function("nfs3_proc_write").return ?,
 }
 
 
-probe nfs.proc4.write = kernel.function("nfs4_proc_write")?,
+probe nfs.proc4.write = kernel.function("nfs4_proc_write")!,
                         module("nfs").function("nfs4_proc_write")?
 {
       
@@ -567,7 +567,7 @@ probe nfs.proc4.write = kernel.function("nfs4_proc_write")?,
 }
 
 
-probe nfs.proc4.write.return = kernel.function("nfs4_proc_write").return ?,
+probe nfs.proc4.write.return = kernel.function("nfs4_proc_write").return !,
                        module("nfs").function("nfs4_proc_write").return?
 {
         version =4
@@ -610,7 +610,7 @@ probe nfs.proc.commit.return = nfs.proc3.commit.return,
 // XXX: on kernels > 2.6.18 (?), module("nfs") -> module("nfsd") and
 // function("nfsN...") becomes function("nfsdN...").  PR3833.
    
-probe nfs.proc3.commit = kernel.function ("nfs3_proc_commit")?,
+probe nfs.proc3.commit = kernel.function ("nfs3_proc_commit")!,
                          module("nfs").function("nfs3_proc_commit")?
 {
 	server_ip = __nfs_write_data_info($cdata,0)
@@ -627,7 +627,7 @@ probe nfs.proc3.commit = kernel.function ("nfs3_proc_commit")?,
         units = "bytes"
 }
 
-probe nfs.proc3.commit.return = kernel.function ("nfs3_proc_commit").return?,
+probe nfs.proc3.commit.return = kernel.function ("nfs3_proc_commit").return!,
                          module("nfs").function("nfs3_proc_commit").return?
 {
         version =3
@@ -642,7 +642,7 @@ probe nfs.proc3.commit.return = kernel.function ("nfs3_proc_commit").return?,
 }
 
 
-probe nfs.proc4.commit = kernel.function ("nfs4_proc_commit")?,
+probe nfs.proc4.commit = kernel.function ("nfs4_proc_commit")!,
                          module("nfs").function("nfs4_proc_commit")?
 {
 	server_ip = __nfs_write_data_info($cdata,0)
@@ -661,7 +661,7 @@ probe nfs.proc4.commit = kernel.function ("nfs4_proc_commit")?,
         units = "bytes"
 }
 
-probe nfs.proc4.commit.return = kernel.function ("nfs4_proc_commit").return?,
+probe nfs.proc4.commit.return = kernel.function ("nfs4_proc_commit").return!,
                          module("nfs").function("nfs4_proc_commit").return?
 {
         version =4
@@ -701,7 +701,7 @@ probe nfs.proc.read_setup.return = nfs.proc2.read_setup.return ,
 
 
 
-probe nfs.proc2.read_setup = kernel.function("nfs_proc_read_setup") ?,
+probe nfs.proc2.read_setup = kernel.function("nfs_proc_read_setup") !,
                        module("nfs").function("nfs_proc_read_setup")?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -719,14 +719,14 @@ probe nfs.proc2.read_setup = kernel.function("nfs_proc_read_setup") ?,
         units = "bytes"
 }
 
-probe nfs.proc2.read_setup.return = kernel.function("nfs_proc_read_setup").return ?,
+probe nfs.proc2.read_setup.return = kernel.function("nfs_proc_read_setup").return !,
                        module("nfs").function("nfs_proc_read_setup").return?
 {
 	name =  "nfs.proc2.read_setup.return"
 	retvalue = 0;
 }
 
-probe nfs.proc3.read_setup = kernel.function("nfs3_proc_read_setup") ?,
+probe nfs.proc3.read_setup = kernel.function("nfs3_proc_read_setup") !,
                        module("nfs").function("nfs3_proc_read_setup")?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -745,14 +745,14 @@ probe nfs.proc3.read_setup = kernel.function("nfs3_proc_read_setup") ?,
         units = "bytes"
 }
 
-probe nfs.proc3.read_setup.return = kernel.function("nfs3_proc_read_setup").return ?,
+probe nfs.proc3.read_setup.return = kernel.function("nfs3_proc_read_setup").return !,
                        module("nfs").function("nfs3_proc_read_setup").return?
 {
 	name =  "nfs.proc3.read_setup.return"
 	retvalue = 0;
 }
 
-probe nfs.proc4.read_setup = kernel.function("nfs4_proc_read_setup") ?,
+probe nfs.proc4.read_setup = kernel.function("nfs4_proc_read_setup") !,
                        module("nfs").function("nfs4_proc_read_setup")?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -770,7 +770,7 @@ probe nfs.proc4.read_setup = kernel.function("nfs4_proc_read_setup") ?,
         size = count
         units = "bytes"
 }
-probe nfs.proc4.read_setup.return = kernel.function("nfs4_proc_read_setup").return ?,
+probe nfs.proc4.read_setup.return = kernel.function("nfs4_proc_read_setup").return !,
                        module("nfs").function("nfs4_proc_read_setup").return?
 {
 	name =  "nfs.proc4.read_setup.return"
@@ -801,7 +801,7 @@ probe nfs.proc.read_done.return = nfs.proc2.read_done.return,
                            nfs.proc4.read_done.return
 {}
 
-probe nfs.proc2.read_done = kernel.function("nfs_read_done")?,
+probe nfs.proc2.read_done = kernel.function("nfs_read_done")!,
                             module("nfs").function("nfs_read_done")?
 {
 %( kernel_v >= "2.6.10" %?
@@ -821,7 +821,7 @@ probe nfs.proc2.read_done = kernel.function("nfs_read_done")?,
 
 }
 
-probe nfs.proc2.read_done.return = kernel.function("nfs_read_done").return?,
+probe nfs.proc2.read_done.return = kernel.function("nfs_read_done").return!,
                             module("nfs").function("nfs_read_done").return?
 {
         version =2
@@ -832,7 +832,7 @@ probe nfs.proc2.read_done.return = kernel.function("nfs_read_done").return?,
 }
 
 
-probe nfs.proc3.read_done = kernel.function("nfs3_read_done")?,
+probe nfs.proc3.read_done = kernel.function("nfs3_read_done")!,
                             module("nfs").function("nfs3_read_done")?
 {
 %( kernel_v >= "2.6.10" %?
@@ -852,7 +852,7 @@ probe nfs.proc3.read_done = kernel.function("nfs3_read_done")?,
 
 }
 
-probe nfs.proc3.read_done.return = kernel.function("nfs3_read_done").return?,
+probe nfs.proc3.read_done.return = kernel.function("nfs3_read_done").return!,
                             module("nfs").function("nfs3_read_done").return?
 {
         version =3
@@ -863,7 +863,7 @@ probe nfs.proc3.read_done.return = kernel.function("nfs3_read_done").return?,
 }
 
 
-probe nfs.proc4.read_done = kernel.function("nfs4_read_done")?,
+probe nfs.proc4.read_done = kernel.function("nfs4_read_done")!,
                             module("nfs").function("nfs4_read_done")?
 {
 %( kernel_v >= "2.6.10" %?
@@ -885,7 +885,7 @@ probe nfs.proc4.read_done = kernel.function("nfs4_read_done")?,
 
 }
 
-probe nfs.proc4.read_done.return = kernel.function("nfs4_read_done").return?,
+probe nfs.proc4.read_done.return = kernel.function("nfs4_read_done").return!,
                             module("nfs").function("nfs4_read_done").return?
 {
         version =4
@@ -925,7 +925,7 @@ probe nfs.proc.write_setup.return = nfs.proc2.write_setup.return,
 {}
 
 
-probe nfs.proc2.write_setup = kernel.function("nfs_proc_write_setup") ?,
+probe nfs.proc2.write_setup = kernel.function("nfs_proc_write_setup") !,
                               module("nfs").function("nfs_proc_write_setup") ?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -942,7 +942,7 @@ probe nfs.proc2.write_setup = kernel.function("nfs_proc_write_setup") ?,
         size = count
         units = "bytes"
 }
-probe nfs.proc2.write_setup.return = kernel.function("nfs_proc_write_setup").return ?,
+probe nfs.proc2.write_setup.return = kernel.function("nfs_proc_write_setup").return !,
                               module("nfs").function("nfs_proc_write_setup").return ?
 {
 	name = "nfs.proc2.write_setup.return"
@@ -950,7 +950,7 @@ probe nfs.proc2.write_setup.return = kernel.function("nfs_proc_write_setup").ret
 }
 
 
-probe nfs.proc3.write_setup = kernel.function("nfs3_proc_write_setup") ?,
+probe nfs.proc3.write_setup = kernel.function("nfs3_proc_write_setup") !,
                               module("nfs").function("nfs3_proc_write_setup") ?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -968,14 +968,14 @@ probe nfs.proc3.write_setup = kernel.function("nfs3_proc_write_setup") ?,
         size = count
         units = "bytes"
 }
-probe nfs.proc3.write_setup.return = kernel.function("nfs3_proc_write_setup").return ?,
+probe nfs.proc3.write_setup.return = kernel.function("nfs3_proc_write_setup").return !,
                               module("nfs").function("nfs3_proc_write_setup").return ?
 {
 	name = "nfs.proc3.write_setup.return"
 	retvalue = 0
 }
 
-probe nfs.proc4.write_setup = kernel.function("nfs4_proc_write_setup") ?,
+probe nfs.proc4.write_setup = kernel.function("nfs4_proc_write_setup") !,
                               module("nfs").function("nfs4_proc_write_setup") ?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -996,7 +996,7 @@ probe nfs.proc4.write_setup = kernel.function("nfs4_proc_write_setup") ?,
         size = count
         units = "bytes"
 }
-probe nfs.proc4.write_setup.return = kernel.function("nfs4_proc_write_setup").return ?,
+probe nfs.proc4.write_setup.return = kernel.function("nfs4_proc_write_setup").return !,
                               module("nfs").function("nfs4_proc_write_setup").return ?
 {
 	name = "nfs.proc4.write_setup.return"
@@ -1029,7 +1029,7 @@ probe nfs.proc.write_done.return = nfs.proc2.write_done.return,
                             nfs.proc4.write_done.return 
 {}
 
-probe nfs.proc2.write_done = kernel.function("nfs_write_done") ?,
+probe nfs.proc2.write_done = kernel.function("nfs_write_done") !,
                              module("nfs").function("nfs_write_done") ?
 {
 %( kernel_v >= "2.6.10" %?
@@ -1050,7 +1050,7 @@ probe nfs.proc2.write_done = kernel.function("nfs_write_done") ?,
 	argstr = sprintf("%d",status)
 }
 
-probe nfs.proc2.write_done.return = kernel.function("nfs_write_done").return ?,
+probe nfs.proc2.write_done.return = kernel.function("nfs_write_done").return !,
                              module("nfs").function("nfs_write_done").return ?
 {
         version =2
@@ -1060,7 +1060,7 @@ probe nfs.proc2.write_done.return = kernel.function("nfs_write_done").return ?,
 %)
 }
 
-probe nfs.proc3.write_done = kernel.function("nfs3_write_done") ?,
+probe nfs.proc3.write_done = kernel.function("nfs3_write_done") !,
                              module("nfs").function("nfs3_write_done") ?
 {
 %( kernel_v >= "2.6.10" %?
@@ -1081,7 +1081,7 @@ probe nfs.proc3.write_done = kernel.function("nfs3_write_done") ?,
 	argstr = sprintf("%d",status)
 }
 
-probe nfs.proc3.write_done.return = kernel.function("nfs3_write_done").return ?,
+probe nfs.proc3.write_done.return = kernel.function("nfs3_write_done").return !,
                              module("nfs").function("nfs3_write_done").return ?
 {
         version =3
@@ -1091,7 +1091,7 @@ probe nfs.proc3.write_done.return = kernel.function("nfs3_write_done").return ?,
 %)
 }
 
-probe nfs.proc4.write_done = kernel.function("nfs4_write_done") ?,
+probe nfs.proc4.write_done = kernel.function("nfs4_write_done") !,
                              module("nfs").function("nfs4_write_done") ?
 {
 %( kernel_v >= "2.6.10" %?
@@ -1114,7 +1114,7 @@ probe nfs.proc4.write_done = kernel.function("nfs4_write_done") ?,
 	argstr = sprintf("%d",status)
 }
 
-probe nfs.proc4.write_done.return = kernel.function("nfs4_write_done").return ?,
+probe nfs.proc4.write_done.return = kernel.function("nfs4_write_done").return !,
                              module("nfs").function("nfs4_write_done").return ?
 {
         version =4
@@ -1151,7 +1151,7 @@ probe nfs.proc.commit_setup.return =nfs.proc3.commit_setup.return,
 
 
 
-probe nfs.proc3.commit_setup = kernel.function("nfs3_proc_commit_setup") ?,
+probe nfs.proc3.commit_setup = kernel.function("nfs3_proc_commit_setup") !,
                               module("nfs").function("nfs3_proc_commit_setup") ?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -1168,14 +1168,14 @@ probe nfs.proc3.commit_setup = kernel.function("nfs3_proc_commit_setup") ?,
         size = count
         units = "bytes"
 }
-probe nfs.proc3.commit_setup.return = kernel.function("nfs3_proc_commit_setup") .return?,
+probe nfs.proc3.commit_setup.return = kernel.function("nfs3_proc_commit_setup") .return!,
                               module("nfs").function("nfs3_proc_commit_setup").return ?
 {
 	name = "nfs.proc3.commit_setup.return"
 	retvalue = 0
 }
 
-probe nfs.proc4.commit_setup = kernel.function("nfs4_proc_commit_setup") ?,
+probe nfs.proc4.commit_setup = kernel.function("nfs4_proc_commit_setup") !,
                               module("nfs").function("nfs4_proc_commit_setup") ?
 {
 	client = stap_NFS_CLIENT($data->inode)
@@ -1195,7 +1195,7 @@ probe nfs.proc4.commit_setup = kernel.function("nfs4_proc_commit_setup") ?,
         size = count
         units = "bytes"
 }
-probe nfs.proc4.commit_setup.return = kernel.function("nfs4_proc_commit_setup") .return?,
+probe nfs.proc4.commit_setup.return = kernel.function("nfs4_proc_commit_setup") .return!,
                               module("nfs").function("nfs4_proc_commit_setup").return ?
 {
 	name = "nfs.proc4.commit_setup.return"
@@ -1229,7 +1229,7 @@ probe nfs.proc.commit_done.return =
 {}
 
 
-probe nfs.proc3.commit_done = kernel.function("nfs3_commit_done") ?,
+probe nfs.proc3.commit_done = kernel.function("nfs3_commit_done") !,
                              module("nfs").function("nfs3_commit_done") ?
 {
 %( kernel_v >= "2.6.10" %?
@@ -1250,7 +1250,7 @@ probe nfs.proc3.commit_done = kernel.function("nfs3_commit_done") ?,
 	argstr = sprintf("%d",status)
 }
 
-probe nfs.proc3.commit_done.return = kernel.function("nfs3_commit_done").return ?,
+probe nfs.proc3.commit_done.return = kernel.function("nfs3_commit_done").return !,
                              module("nfs").function("nfs3_commit_done").return ?
 {
         version =3
@@ -1260,7 +1260,7 @@ probe nfs.proc3.commit_done.return = kernel.function("nfs3_commit_done").return
 %)
 }
 
-probe nfs.proc4.commit_done = kernel.function("nfs4_commit_done") ?,
+probe nfs.proc4.commit_done = kernel.function("nfs4_commit_done") !,
                              module("nfs").function("nfs4_commit_done") ?
 {
 %( kernel_v >= "2.6.10" %?
@@ -1283,7 +1283,7 @@ probe nfs.proc4.commit_done = kernel.function("nfs4_commit_done") ?,
 	argstr = sprintf("%d",status)
 }
 
-probe nfs.proc4.commit_done.return = kernel.function("nfs4_commit_done").return ?,
+probe nfs.proc4.commit_done.return = kernel.function("nfs4_commit_done").return !,
                              module("nfs").function("nfs4_commit_done").return ?
 {
         version =4
@@ -1305,7 +1305,7 @@ probe nfs.proc4.commit_done.return = kernel.function("nfs4_commit_done").return
 *   mode   : file  mode
 */
 
-probe nfs.proc.open = kernel.function("nfs_open") ?,
+probe nfs.proc.open = kernel.function("nfs_open") !,
                       module("nfs").function("nfs_open") ?
 {
 	server_ip = __i2n_ip_proto($inode,0)
@@ -1320,7 +1320,7 @@ probe nfs.proc.open = kernel.function("nfs_open") ?,
 	argstr = sprintf("%s,%d,%d",filename,flag,mode)
 }
 
-probe nfs.proc.open.return = kernel.function("nfs_open").return ?,
+probe nfs.proc.open.return = kernel.function("nfs_open").return !,
                       module("nfs").function("nfs_open").return ?
 {
 	name = "nfs.proc.open.return"
@@ -1339,7 +1339,7 @@ probe nfs.proc.open.return = kernel.function("nfs_open").return ?,
 *   flag   : file flag
 *   mode   : file  mode
 */
-probe nfs.proc.release= kernel.function("nfs_release") ?,
+probe nfs.proc.release= kernel.function("nfs_release") !,
                       module("nfs").function("nfs_release") ?
 {
 	server_ip = __i2n_ip_proto($inode,0)
@@ -1354,7 +1354,7 @@ probe nfs.proc.release= kernel.function("nfs_release") ?,
 	argstr = sprintf("%s,%d,%d",filename,flag,mode)
 }
 
-probe nfs.proc.release.return = kernel.function("nfs_release").return ?,
+probe nfs.proc.release.return = kernel.function("nfs_release").return !,
                       module("nfs").function("nfs_release").return ?
 {
 	name = "nfs.proc.release.return"
@@ -1367,7 +1367,7 @@ probe nfs.proc.release.return = kernel.function("nfs_release").return ?,
 * Arguments:
 *  errorcode : indicates the type of error
 */
-probe nfs.proc4.handle_exception = kernel.function("nfs4_handle_exception") ?,
+probe nfs.proc4.handle_exception = kernel.function("nfs4_handle_exception") !,
                                module("nfs").function("nfs4_handle_exception")?
 {
 	version =4
@@ -1378,7 +1378,7 @@ probe nfs.proc4.handle_exception = kernel.function("nfs4_handle_exception") ?,
         argstr =  sprintf("%d",errorcode)
 }
 
-probe nfs.proc4.handle_exception.return = kernel.function("nfs4_handle_exception").return ?,
+probe nfs.proc4.handle_exception.return = kernel.function("nfs4_handle_exception").return !,
                                module("nfs").function("nfs4_handle_exception").return?
 {
         name = "nfs.proc4.handle_exception.return"
@@ -1408,7 +1408,7 @@ probe nfs.proc.create.return = nfs.proc2.create.return,
                                nfs.proc4.create.return
 {}
 
-probe nfs.proc2.create = kernel.function("nfs_proc_create")?,
+probe nfs.proc2.create = kernel.function("nfs_proc_create")!,
                          module("nfs").function("nfs_proc_create")?
 {
 	server_ip = __i2n_ip_proto($dir,0)
@@ -1424,7 +1424,7 @@ probe nfs.proc2.create = kernel.function("nfs_proc_create")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfs.proc2.create.return = kernel.function("nfs_proc_create").return?,
+probe nfs.proc2.create.return = kernel.function("nfs_proc_create").return!,
                          module("nfs").function("nfs_proc_create").return?
 {
 	name = "nfs.proc2.create.return"
@@ -1432,7 +1432,7 @@ probe nfs.proc2.create.return = kernel.function("nfs_proc_create").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfs.proc3.create = kernel.function("nfs3_proc_create")?,
+probe nfs.proc3.create = kernel.function("nfs3_proc_create")!,
                          module("nfs").function("nfs3_proc_create")?
 {
 	server_ip = __i2n_ip_proto($dir,0)
@@ -1449,7 +1449,7 @@ probe nfs.proc3.create = kernel.function("nfs3_proc_create")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfs.proc3.create.return = kernel.function("nfs3_proc_create").return?,
+probe nfs.proc3.create.return = kernel.function("nfs3_proc_create").return!,
                          module("nfs").function("nfs3_proc_create").return?
 {
 	name = "nfs.proc3.create.return"
@@ -1457,7 +1457,7 @@ probe nfs.proc3.create.return = kernel.function("nfs3_proc_create").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfs.proc4.create = kernel.function("nfs4_proc_create")?,
+probe nfs.proc4.create = kernel.function("nfs4_proc_create")!,
                          module("nfs").function("nfs4_proc_create")?
 {
 	server_ip = __i2n_ip_proto($dir,0)
@@ -1474,7 +1474,7 @@ probe nfs.proc4.create = kernel.function("nfs4_proc_create")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfs.proc4.create.return = kernel.function("nfs4_proc_create").return?,
+probe nfs.proc4.create.return = kernel.function("nfs4_proc_create").return!,
                          module("nfs").function("nfs4_proc_create").return?
 {
 	name = "nfs.proc4.create.return"
@@ -1504,7 +1504,7 @@ probe nfs.proc.remove.return = nfs.proc2.remove.return,
                                nfs.proc4.remove.return
 {}
 
-probe nfs.proc2.remove = kernel.function("nfs_proc_remove")?,
+probe nfs.proc2.remove = kernel.function("nfs_proc_remove")!,
                          module("nfs").function("nfs_proc_remove")?
 {
 	server_ip = __i2n_ip_proto($dir,0)
@@ -1519,7 +1519,7 @@ probe nfs.proc2.remove = kernel.function("nfs_proc_remove")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfs.proc2.remove.return = kernel.function("nfs_proc_remove").return?,
+probe nfs.proc2.remove.return = kernel.function("nfs_proc_remove").return!,
                          module("nfs").function("nfs_proc_remove").return?
 {
 	name = "nfs.proc2.remove.return"
@@ -1527,7 +1527,7 @@ probe nfs.proc2.remove.return = kernel.function("nfs_proc_remove").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfs.proc3.remove = kernel.function("nfs3_proc_remove")?,
+probe nfs.proc3.remove = kernel.function("nfs3_proc_remove")!,
                          module("nfs").function("nfs3_proc_remove")?
 {
 	server_ip = __i2n_ip_proto($dir,0)
@@ -1542,7 +1542,7 @@ probe nfs.proc3.remove = kernel.function("nfs3_proc_remove")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfs.proc3.remove.return = kernel.function("nfs3_proc_remove").return?,
+probe nfs.proc3.remove.return = kernel.function("nfs3_proc_remove").return!,
                          module("nfs").function("nfs3_proc_remove").return?
 {
 	name = "nfs.proc3.remove.return"
@@ -1550,7 +1550,7 @@ probe nfs.proc3.remove.return = kernel.function("nfs3_proc_remove").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfs.proc4.remove = kernel.function("nfs4_proc_remove")?,
+probe nfs.proc4.remove = kernel.function("nfs4_proc_remove")!,
                          module("nfs").function("nfs4_proc_remove")?
 {
 	server_ip = __i2n_ip_proto($dir,0)
@@ -1565,7 +1565,7 @@ probe nfs.proc4.remove = kernel.function("nfs4_proc_remove")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfs.proc4.remove.return = kernel.function("nfs4_proc_remove").return?,
+probe nfs.proc4.remove.return = kernel.function("nfs4_proc_remove").return!,
                          module("nfs").function("nfs4_proc_remove").return?
 {
 	name = "nfs.proc4.remove.return"
@@ -1598,7 +1598,7 @@ probe nfs.proc.rename.return = nfs.proc2.rename.return,
                                nfs.proc4.rename.return
 {}
 
-probe nfs.proc2.rename = kernel.function("nfs_proc_rename")?,
+probe nfs.proc2.rename = kernel.function("nfs_proc_rename")!,
                          module("nfs").function("nfs_proc_rename")?
 {
 	server_ip = __i2n_ip_proto($old_dir,0)
@@ -1616,7 +1616,7 @@ probe nfs.proc2.rename = kernel.function("nfs_proc_rename")?,
 	argstr = sprintf("%s,%s",old_name,new_name)
 }
 
-probe nfs.proc2.rename.return = kernel.function("nfs_proc_rename").return?,
+probe nfs.proc2.rename.return = kernel.function("nfs_proc_rename").return!,
                          module("nfs").function("nfs_proc_rename").return?
 {
 	name = "nfs.proc2.rename.return"
@@ -1624,7 +1624,7 @@ probe nfs.proc2.rename.return = kernel.function("nfs_proc_rename").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfs.proc3.rename = kernel.function("nfs3_proc_rename")?,
+probe nfs.proc3.rename = kernel.function("nfs3_proc_rename")!,
                          module("nfs").function("nfs3_proc_rename")?
 {
 	server_ip = __i2n_ip_proto($old_dir,0)
@@ -1642,7 +1642,7 @@ probe nfs.proc3.rename = kernel.function("nfs3_proc_rename")?,
 	argstr = sprintf("%s,%s",old_name,new_name)
 }
 
-probe nfs.proc3.rename.return = kernel.function("nfs3_proc_rename").return?,
+probe nfs.proc3.rename.return = kernel.function("nfs3_proc_rename").return!,
                          module("nfs").function("nfs3_proc_rename").return?
 {
 	name = "nfs.proc3.rename.return"
@@ -1650,7 +1650,7 @@ probe nfs.proc3.rename.return = kernel.function("nfs3_proc_rename").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfs.proc4.rename = kernel.function("nfs4_proc_rename")?,
+probe nfs.proc4.rename = kernel.function("nfs4_proc_rename")!,
                          module("nfs").function("nfs4_proc_rename")?
 {
 	server_ip = __i2n_ip_proto($old_dir,0)
@@ -1668,7 +1668,7 @@ probe nfs.proc4.rename = kernel.function("nfs4_proc_rename")?,
 	argstr = sprintf("%s,%s",old_name,new_name)
 }
 
-probe nfs.proc4.rename.return = kernel.function("nfs4_proc_rename").return?,
+probe nfs.proc4.rename.return = kernel.function("nfs4_proc_rename").return!,
                          module("nfs").function("nfs4_proc_rename").return?
 {
 	name = "nfs.proc4.rename.return"
diff --git a/tapset/nfsd.stp b/tapset/nfsd.stp
index 52add690..df8efa87 100644
--- a/tapset/nfsd.stp
+++ b/tapset/nfsd.stp
@@ -139,7 +139,7 @@ function p_long:long(cnt:long) %{ /* pure */
 *  prog : program number
 *  proc : procedure number
 */
-probe nfsd.dispatch = kernel.function("nfsd_dispatch")?,
+probe nfsd.dispatch = kernel.function("nfsd_dispatch")!,
                       module("nfsd").function("nfsd_dispatch") ?
 {
 	client_ip = addr_from_rqst($rqstp)
@@ -154,7 +154,7 @@ probe nfsd.dispatch = kernel.function("nfsd_dispatch")?,
 	argstr = sprintf("%d,%d",version,proto)
 }
 
-probe nfsd.dispatch.return = kernel.function("nfsd_dispatch").return?,
+probe nfsd.dispatch.return = kernel.function("nfsd_dispatch").return!,
                       module("nfsd").function("nfsd_dispatch").return ?
 {
 	name = "nfsd.dispatch.return"
@@ -201,7 +201,7 @@ probe nfsd.proc.lookup.return = nfsd.proc2.lookup.return,
                          nfsd.proc3.lookup.return
 {}
 
-probe nfsd.proc2.lookup = kernel.function("nfsd_proc_lookup") ?,
+probe nfsd.proc2.lookup = kernel.function("nfsd_proc_lookup") !,
                           module("nfsd").function("nfsd_proc_lookup") ?
 {
 	client_ip = addr_from_rqst($rqstp)
@@ -217,7 +217,7 @@ probe nfsd.proc2.lookup = kernel.function("nfsd_proc_lookup") ?,
 }
 
  
-probe nfsd.proc2.lookup.return = kernel.function("nfsd_proc_lookup").return ?,
+probe nfsd.proc2.lookup.return = kernel.function("nfsd_proc_lookup").return !,
                           module("nfsd").function("nfsd_proc_lookup").return ?
 {
 	name = "nfsd.proc2.lookup.return"
@@ -225,7 +225,7 @@ probe nfsd.proc2.lookup.return = kernel.function("nfsd_proc_lookup").return ?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfsd.proc3.lookup = kernel.function("nfsd3_proc_lookup") ?,
+probe nfsd.proc3.lookup = kernel.function("nfsd3_proc_lookup") !,
                           module("nfsd").function("nfsd3_proc_lookup") ?
 {
 	client_ip = addr_from_rqst($rqstp)
@@ -240,7 +240,7 @@ probe nfsd.proc3.lookup = kernel.function("nfsd3_proc_lookup") ?,
 	argstr = sprintf("%s",filename)
 } 
 
-probe nfsd.proc3.lookup.return = kernel.function("nfsd3_proc_lookup").return ?,
+probe nfsd.proc3.lookup.return = kernel.function("nfsd3_proc_lookup").return !,
                           module("nfsd").function("nfsd3_proc_lookup").return ?
 {
 	name = "nfsd.proc3.lookup.return"
@@ -275,7 +275,7 @@ probe nfsd.proc.read.return = nfsd.proc2.read.return,
 
 }
 
-probe nfsd.proc2.read = kernel.function("nfsd_proc_read")?,
+probe nfsd.proc2.read = kernel.function("nfsd_proc_read")!,
                         module("nfsd").function("nfsd_proc_read")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -300,7 +300,7 @@ probe nfsd.proc2.read = kernel.function("nfsd_proc_read")?,
 }
 
  
-probe nfsd.proc2.read.return = kernel.function("nfsd_proc_read").return?,
+probe nfsd.proc2.read.return = kernel.function("nfsd_proc_read").return!,
                         module("nfsd").function("nfsd_proc_read").return?
 {
 	name = "nfsd.proc2.read.return"
@@ -308,7 +308,7 @@ probe nfsd.proc2.read.return = kernel.function("nfsd_proc_read").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfsd.proc3.read = kernel.function("nfsd3_proc_read")?,
+probe nfsd.proc3.read = kernel.function("nfsd3_proc_read")!,
                         module("nfsd").function("nfsd3_proc_read")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -333,7 +333,7 @@ probe nfsd.proc3.read = kernel.function("nfsd3_proc_read")?,
 }
 
  
-probe nfsd.proc3.read.return = kernel.function("nfsd3_proc_read").return?,
+probe nfsd.proc3.read.return = kernel.function("nfsd3_proc_read").return!,
                         module("nfsd").function("nfsd3_proc_read").return?
 {
 	name = "nfsd.proc3.read.return"
@@ -368,7 +368,7 @@ probe nfsd.proc.write.return = nfsd.proc2.write.return,
 
 }
 
-probe nfsd.proc2.write = kernel.function("nfsd_proc_write")?,
+probe nfsd.proc2.write = kernel.function("nfsd_proc_write")!,
                         module("nfsd").function("nfsd_proc_write")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -393,7 +393,7 @@ probe nfsd.proc2.write = kernel.function("nfsd_proc_write")?,
 }
 
  
-probe nfsd.proc2.write.return = kernel.function("nfsd_proc_write").return?,
+probe nfsd.proc2.write.return = kernel.function("nfsd_proc_write").return!,
                         module("nfsd").function("nfsd_proc_write").return?
 {
 	name = "nfsd.proc2.write.return"
@@ -401,7 +401,7 @@ probe nfsd.proc2.write.return = kernel.function("nfsd_proc_write").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfsd.proc3.write = kernel.function("nfsd3_proc_write")?,
+probe nfsd.proc3.write = kernel.function("nfsd3_proc_write")!,
                         module("nfsd").function("nfsd3_proc_write")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -427,7 +427,7 @@ probe nfsd.proc3.write = kernel.function("nfsd3_proc_write")?,
 }
 
  
-probe nfsd.proc3.write.return = kernel.function("nfsd3_proc_write").return?,
+probe nfsd.proc3.write.return = kernel.function("nfsd3_proc_write").return!,
                         module("nfsd").function("nfsd3_proc_write").return?
 {
 	name = "nfsd.proc3.write.return"
@@ -458,7 +458,7 @@ probe nfsd.proc.commit.return = nfsd.proc3.commit.return
 
 }
 
-probe nfsd.proc3.commit = kernel.function("nfsd3_proc_commit")?,
+probe nfsd.proc3.commit = kernel.function("nfsd3_proc_commit")!,
                         module("nfsd").function("nfsd3_proc_commit")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -476,7 +476,7 @@ probe nfsd.proc3.commit = kernel.function("nfsd3_proc_commit")?,
         units = "bytes"
 }
 
-probe nfsd.proc3.commit.return = kernel.function("nfsd3_proc_commit").return?,
+probe nfsd.proc3.commit.return = kernel.function("nfsd3_proc_commit").return!,
                         module("nfsd").function("nfsd3_proc_commit").return?
 {
 	name = "nfsd.proc3.commit.return"
@@ -503,7 +503,7 @@ probe nfsd.proc.create.return = nfsd.proc2.create.return,
                                 nfsd.proc3.create.return
 {}
 
-probe nfsd.proc2.create = kernel.function("nfsd_proc_create")?,
+probe nfsd.proc2.create = kernel.function("nfsd_proc_create")!,
                          module("nfsd").function("nfsd_proc_create")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -518,7 +518,7 @@ probe nfsd.proc2.create = kernel.function("nfsd_proc_create")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfsd.proc2.create.return =  kernel.function("nfsd_proc_create").return?,
+probe nfsd.proc2.create.return =  kernel.function("nfsd_proc_create").return!,
                                  module("nfsd").function("nfsd_proc_create").return?
 {
 	name = "nfsd.proc2.create.return"
@@ -526,7 +526,7 @@ probe nfsd.proc2.create.return =  kernel.function("nfsd_proc_create").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfsd.proc3.create = kernel.function("nfsd3_proc_create")?,
+probe nfsd.proc3.create = kernel.function("nfsd3_proc_create")!,
                          module("nfsd").function("nfsd3_proc_create")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -541,7 +541,7 @@ probe nfsd.proc3.create = kernel.function("nfsd3_proc_create")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfsd.proc3.create.return =  kernel.function("nfsd3_proc_create").return?,
+probe nfsd.proc3.create.return =  kernel.function("nfsd3_proc_create").return!,
                                  module("nfsd").function("nfsd3_proc_create").return?
 {
 	name = "nfsd.proc3.create.return"
@@ -568,7 +568,7 @@ probe nfsd.proc.remove.return = nfsd.proc2.remove.return,
                                 nfsd.proc3.remove.return
 {}
 
-probe nfsd.proc2.remove = kernel.function("nfsd_proc_remove")?,
+probe nfsd.proc2.remove = kernel.function("nfsd_proc_remove")!,
                          module("nfsd").function("nfsd_proc_remove")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -583,7 +583,7 @@ probe nfsd.proc2.remove = kernel.function("nfsd_proc_remove")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfsd.proc2.remove.return =  kernel.function("nfsd_proc_remove").return?,
+probe nfsd.proc2.remove.return =  kernel.function("nfsd_proc_remove").return!,
                                  module("nfsd").function("nfsd_proc_remove").return?
 {
 	name = "nfsd.proc2.remove.return"
@@ -591,7 +591,7 @@ probe nfsd.proc2.remove.return =  kernel.function("nfsd_proc_remove").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfsd.proc3.remove = kernel.function("nfsd3_proc_remove")?,
+probe nfsd.proc3.remove = kernel.function("nfsd3_proc_remove")!,
                          module("nfsd").function("nfsd3_proc_remove")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -606,7 +606,7 @@ probe nfsd.proc3.remove = kernel.function("nfsd3_proc_remove")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfsd.proc3.remove.return =  kernel.function("nfsd3_proc_remove").return?,
+probe nfsd.proc3.remove.return =  kernel.function("nfsd3_proc_remove").return!,
                                  module("nfsd").function("nfsd3_proc_remove").return?
 {
 	name = "nfsd.proc3.remove.return"
@@ -634,7 +634,7 @@ probe nfsd.proc.rename.return = nfsd.proc2.rename.return,
                          nfsd.proc3.rename.return
 {}
 
-probe nfsd.proc2.rename =  kernel.function("nfsd_proc_rename")?,
+probe nfsd.proc2.rename =  kernel.function("nfsd_proc_rename")!,
                            module("nfsd").function("nfsd_proc_rename")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -652,7 +652,7 @@ probe nfsd.proc2.rename =  kernel.function("nfsd_proc_rename")?,
 	argstr = sprintf("%s,%s",filename,tname)
 }
 
-probe nfsd.proc2.rename.return =  kernel.function("nfsd_proc_rename").return?,
+probe nfsd.proc2.rename.return =  kernel.function("nfsd_proc_rename").return!,
                            module("nfsd").function("nfsd_proc_rename").return?
 {
 	name = "nfsd.proc2.rename.return"
@@ -660,7 +660,7 @@ probe nfsd.proc2.rename.return =  kernel.function("nfsd_proc_rename").return?,
 	retstr = sprintf("%d",$return)
 }
 
-probe nfsd.proc3.rename =  kernel.function("nfsd3_proc_rename")?,
+probe nfsd.proc3.rename =  kernel.function("nfsd3_proc_rename")!,
                            module("nfsd").function("nfsd3_proc_rename")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -678,7 +678,7 @@ probe nfsd.proc3.rename =  kernel.function("nfsd3_proc_rename")?,
 	argstr = sprintf("%s,%s",filename,tname)
 }
 
-probe nfsd.proc3.rename.return =  kernel.function("nfsd3_proc_rename").return?,
+probe nfsd.proc3.rename.return =  kernel.function("nfsd3_proc_rename").return!,
                            module("nfsd").function("nfsd3_proc_rename").return?
 {
 	name = "nfsd.proc3.rename.return"
@@ -702,7 +702,7 @@ probe nfsd.proc.compound = nfsd.proc4.compound
 probe nfsd.proc.compound.return = nfsd.proc4.compound.return
 {}
 
-probe nfsd.proc4.compound = kernel.function("nfsd4_proc_compound")?,
+probe nfsd.proc4.compound = kernel.function("nfsd4_proc_compound")!,
                             module("nfsd").function("nfsd4_proc_compound")?
 {
 	client_ip =  addr_from_rqst($rqstp)
@@ -716,7 +716,7 @@ probe nfsd.proc4.compound = kernel.function("nfsd4_proc_compound")?,
 	argstr = sprintf("%d",num)
 }
 
-probe nfsd.proc4.compound.return = kernel.function("nfsd4_proc_compound").return?,
+probe nfsd.proc4.compound.return = kernel.function("nfsd4_proc_compound").return!,
                             module("nfsd").function("nfsd4_proc_compound").return?
 {
 	name = "nfsd.proc4.compound.return"
@@ -754,7 +754,7 @@ probe nfsd.return = nfsd.open.return,
 *  access : indicates the type of open(read/write/commit/readdir...) 
 *  type : type of file(regular file or dir)
 */
-probe nfsd.open = kernel.function("nfsd_open") ?,
+probe nfsd.open = kernel.function("nfsd_open") !,
                   module("nfsd").function("nfsd_open")?
 {
 	fh = __svc_fh($fhp)
@@ -766,7 +766,7 @@ probe nfsd.open = kernel.function("nfsd_open") ?,
 	argstr = sprintf("%d",access)
 }
 
-probe nfsd.open.return = kernel.function("nfsd_open").return ?,
+probe nfsd.open.return = kernel.function("nfsd_open").return !,
                   module("nfsd").function("nfsd_open").return?
 {
 	name = "nfsd.open.return"
@@ -779,7 +779,7 @@ probe nfsd.open.return = kernel.function("nfsd_open").return ?,
 * Arguments:
 * filename : file name
 */
-probe nfsd.close = kernel.function("nfsd_close")?,
+probe nfsd.close = kernel.function("nfsd_close")!,
                    module("nfsd").function("nfsd_close")?
 {
 	filename = __file_filename($filp)
@@ -788,7 +788,7 @@ probe nfsd.close = kernel.function("nfsd_close")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfsd.close.return = kernel.function("nfsd_close").return?,
+probe nfsd.close.return = kernel.function("nfsd_close").return!,
                    module("nfsd").function("nfsd_close").return?
 {}
 /*probe nfsd.read
@@ -804,7 +804,7 @@ probe nfsd.close.return = kernel.function("nfsd_close").return?,
          and length of each buffer
 *  vlen : read blocks 
 */
-probe nfsd.read = kernel.function("nfsd_read") ?,
+probe nfsd.read = kernel.function("nfsd_read") !,
                   module("nfsd").function("nfsd_read")?
 {
 	fh = __svc_fh($fhp)
@@ -824,7 +824,7 @@ probe nfsd.read = kernel.function("nfsd_read") ?,
 	units = "bytes"
 } 
 
-probe nfsd.read.return = kernel.function("nfsd_read").return ?,
+probe nfsd.read.return = kernel.function("nfsd_read").return !,
                   module("nfsd").function("nfsd_read").return?
 {
 	name = "nfsd.read.return"
@@ -844,7 +844,7 @@ probe nfsd.read.return = kernel.function("nfsd_read").return ?,
          and length of each buffer
 *  vlen : read blocks 
 */
-probe nfsd.write = kernel.function("nfsd_write")?,
+probe nfsd.write = kernel.function("nfsd_write")!,
                    module("nfsd").function("nfsd_write")?
 {
 	fh = __svc_fh($fhp)
@@ -864,7 +864,7 @@ probe nfsd.write = kernel.function("nfsd_write")?,
 	units = "bytes"
 }
 
-probe nfsd.write.return = kernel.function("nfsd_write").return?,
+probe nfsd.write.return = kernel.function("nfsd_write").return!,
                    module("nfsd").function("nfsd_write").return?
 {
 	name = "nfsd.write.return"
@@ -881,7 +881,7 @@ probe nfsd.write.return = kernel.function("nfsd_write").return?,
 *  count : read bytes
 *  offset : the offset of file
 */
-probe nfsd.commit = kernel.function("nfsd_commit")?,
+probe nfsd.commit = kernel.function("nfsd_commit")!,
                     module("nfsd").function("nfsd_commit")?
 {
 	fh = __svc_fh($fhp)
@@ -897,7 +897,7 @@ probe nfsd.commit = kernel.function("nfsd_commit")?,
 	units = "bytes"
 }
 
-probe nfsd.commit.return = kernel.function("nfsd_commit").return?,
+probe nfsd.commit.return = kernel.function("nfsd_commit").return!,
                     module("nfsd").function("nfsd_commit").return ?
 {
 	name = "nfsd.commit.return"
@@ -914,7 +914,7 @@ probe nfsd.commit.return = kernel.function("nfsd_commit").return?,
 *  filelen  : the length of file name
 */
 
-probe nfsd.lookup = kernel.function("nfsd_lookup")?,
+probe nfsd.lookup = kernel.function("nfsd_lookup")!,
                     module("nfsd").function("nfsd_lookup")?
 {
 	fh = __svc_fh($fhp)
@@ -926,7 +926,7 @@ probe nfsd.lookup = kernel.function("nfsd_lookup")?,
 	argstr = sprintf("%s",filename)
 }
 
-probe nfsd.lookup.return = kernel.function("nfsd_lookup").return?,
+probe nfsd.lookup.return = kernel.function("nfsd_lookup").return!,
                             module("nfsd").function("nfsd_lookup").return?
 {
 	name = "nfsd.lookup.return"
@@ -946,7 +946,7 @@ probe nfsd.lookup.return = kernel.function("nfsd_lookup").return?,
 *  iap_valid: Attribute flags
 *  iap_mode : file access mode
 */
-probe nfsd.create = kernel.function("nfsd_create")?,         
+probe nfsd.create = kernel.function("nfsd_create")!,         
                     module("nfsd").function("nfsd_create")?
 {
 	fh = __svc_fh($fhp)
@@ -961,7 +961,7 @@ probe nfsd.create = kernel.function("nfsd_create")?,
 	argstr = sprintf("%s,%d",filename,type)
 }
 
-probe nfsd.create.return = kernel.function("nfsd_create").return?,         
+probe nfsd.create.return = kernel.function("nfsd_create").return!,         
                     module("nfsd").function("nfsd_create").return?
 {
 	name = "nfsd.create.return"
@@ -986,7 +986,7 @@ probe nfsd.create.return = kernel.function("nfsd_create").return?,
 *  verfier :  file attributes (atime,mtime,mode).It's used to reset file
               attributes for CREATE_EXCLUSIVE
 */
-probe nfsd.createv3 = kernel.function("nfsd_create_v3")?,         
+probe nfsd.createv3 = kernel.function("nfsd_create_v3")!,         
                     module("nfsd").function("nfsd_create_v3")?
 {
 	fh = __svc_fh($fhp)
@@ -1003,7 +1003,7 @@ probe nfsd.createv3 = kernel.function("nfsd_create_v3")?,
 	argstr = sprintf("%s,%d",filename,createmode)
 }
 
-probe nfsd.createv3.return = kernel.function("nfsd_create_v3").return?,         
+probe nfsd.createv3.return = kernel.function("nfsd_create_v3").return!,         
                     module("nfsd").function("nfsd_create_v3").return?
 {
 	name = "nfsd.createv3.return"
@@ -1021,7 +1021,7 @@ probe nfsd.createv3.return = kernel.function("nfsd_create_v3").return?,
 *  filelen  : the length of file name
 *  type : file type(file or dir)
 */
-probe nfsd.unlink = kernel.function("nfsd_unlink")?,         
+probe nfsd.unlink = kernel.function("nfsd_unlink")!,         
                     module("nfsd").function("nfsd_unlink")?
 {
 	fh = __svc_fh($fhp)
@@ -1034,7 +1034,7 @@ probe nfsd.unlink = kernel.function("nfsd_unlink")?,
 	argstr = sprintf("%s,%d",filename,type)
 }
 
-probe nfsd.unlink.return = kernel.function("nfsd_unlink").return?,         
+probe nfsd.unlink.return = kernel.function("nfsd_unlink").return!,         
                     module("nfsd").function("nfsd_unlink").return?
 {
 	name = "nfsd.unlink.return"
@@ -1054,7 +1054,7 @@ probe nfsd.unlink.return = kernel.function("nfsd_unlink").return?,
 *   tlen : length of new file name
 */
 
-probe nfsd.rename =  kernel.function("nfsd_rename")?,
+probe nfsd.rename =  kernel.function("nfsd_rename")!,
                            module("nfsd").function("nfsd_rename")?
 {
 	fh = __svc_fh($ffhp)
@@ -1069,7 +1069,7 @@ probe nfsd.rename =  kernel.function("nfsd_rename")?,
 	argstr = sprintf("%s,%s",filename,tname)
 }
 
-probe nfsd.rename.return =  kernel.function("nfsd_rename").return?,
+probe nfsd.rename.return =  kernel.function("nfsd_rename").return!,
                            module("nfsd").function("nfsd_rename").return?
 {
 	name = "nfsd.rename.return"
diff --git a/tapset/scsi.stp b/tapset/scsi.stp
index 5758f315..f1090231 100644
--- a/tapset/scsi.stp
+++ b/tapset/scsi.stp
@@ -25,7 +25,7 @@
   */
 // FIXME describe the device_state
 probe scsi.ioentry
-	= module("scsi_mod").function("scsi_prep_fn@drivers/scsi/scsi_lib.c")?,
+	= module("scsi_mod").function("scsi_prep_fn@drivers/scsi/scsi_lib.c")!,
 	  kernel.function("scsi_prep_fn@drivers/scsi/scsi_lib.c")?
 {
 	if($req->rq_disk == 0)  {
@@ -53,7 +53,7 @@ probe scsi.ioentry
  * @req_bufflen: The request buffer length
  */
 probe scsi.iodispatching
-	= module("scsi_mod").function("scsi_dispatch_cmd@drivers/scsi/scsi.c")?,
+	= module("scsi_mod").function("scsi_dispatch_cmd@drivers/scsi/scsi.c")!,
 	  kernel.function("scsi_dispatch_cmd@drivers/scsi/scsi.c")?
 {
 
@@ -84,7 +84,7 @@ probe scsi.iodispatching
  * 		from/to the device.
  */
 probe scsi.iodone
-	= module("scsi_mod").function("scsi_done@drivers/scsi/scsi.c")?,
+	= module("scsi_mod").function("scsi_done@drivers/scsi/scsi.c")!,
 	  kernel.function("scsi_done@drivers/scsi/scsi.c")?
 
 {
@@ -111,7 +111,7 @@ probe scsi.iodone
  */
 // mid-layer processes the completed IO
 probe scsi.iocompleted
-	= module("scsi_mod").function("scsi_io_completion@drivers/scsi/scsi_lib.c")?,
+	= module("scsi_mod").function("scsi_io_completion@drivers/scsi/scsi_lib.c")!,
 	  kernel.function("scsi_io_completion@drivers/scsi/scsi_lib.c")?
 {
 	host_no = $cmd->device->host->host_no