[PATCH] according to embedded function test

[PATCH] according to embedded function test

[Wenji Huang]

Hi,

    According to embedded function test, there are some fails reported.

        1. clones_from_clnt,tasks_from_clnt in rpc.stp. cl_count and 
cl_users are missing in 2.6.23.
        2. __nfsi_ndirty in nfs.stp. ndirty is removed in 2.6.23
        3. __nfsv4_bitmask depended on CONFIG

Please review the patch. Especially default value.

Thanks,
wenji


--- src/tapset/rpc.stp    2007-09-26 04:16:00.000000000 -0400
+++ src.new/tapset/rpc.stp    2007-09-26 04:14:42.000000000 -0400
@@ -946,13 +946,21 @@ function port_from_clnt:long(clnt:long)
 function clones_from_clnt:long(clnt:long)
 %{ /* pure */
     struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt;
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
     THIS->__retvalue = atomic_read(&clnt->cl_count); /* FIXME: deref 
hazard! */
+#else
+    THIS->__retvalue = -1;
+#endif
 %}
 
 function tasks_from_clnt:long(clnt:long)
 %{ /* pure */
     struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt;
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
     THIS->__retvalue = atomic_read(&clnt->cl_users); /* FIXME: deref 
hazard! */
+#else
+    THIS->__retvalue = -1;
+#endif
 %}
 
 function proc_from_msg:long(msg:long)
--- src/tapset/nfs.stp    2007-09-26 04:15:59.000000000 -0400
+++ src.new/tapset/nfs.stp    2007-09-26 04:03:35.000000000 -0400
@@ -60,7 +60,11 @@ function __nfsi_ndirty:long (inode:long)
         THIS->__retvalue = -1;
     else {
         struct nfs_inode * nfsi = NFS_I(inode);
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
         THIS->__retvalue = kread(&(nfsi->ndirty));
+#else
+        THIS->__retvalue = -1;
+#endif
     }
     CATCH_DEREF_FAULT();
 %}
--- src/tapset/nfs_proc.stp    2007-09-26 04:16:00.000000000 -0400
+++ src.new/tapset/nfs_proc.stp    2007-09-26 03:36:16.000000000 -0400
@@ -124,8 +124,9 @@ function __nfsv4_bitmask :long(dir:long,
     struct inode * dir = (struct inode *)(long)(THIS->dir);
         struct nfs_server * server = NFS_SERVER(dir); /* FIXME: deref 
hazard! */
 
+#ifdef CONFIG_NFS_V4
         THIS->__retvalue = kread(&(server->attr_bitmask[i]));
-
+#endif
         CATCH_DEREF_FAULT();
 %}