Merge branch 'master' into pr6866

Resolved conflicts:
	runtime/task_finder.c: name vs path.

1 files changed, 76 insertions, 101 deletions

diff --git a/tapset/nfs.stp b/tapset/nfs.stp
index 474b091f..6752747f 100644
--- a/tapset/nfs.stp
+++ b/tapset/nfs.stp
@@ -135,69 +135,50 @@ function __nfs_wpages:long(inode:long) %{ /* pure */
 %}
 
 /*Get struct inode from struct page*/
-function __p2i :long(page:long) %{ /* pure */
-    struct page *page = (struct page *)((long)THIS->page);
-    struct address_space *mapping = page? kread(&(page->mapping)) : NULL;
-
-    if (mapping == NULL)
-        THIS->__retvalue = 0;
-    else
-        THIS->__retvalue = (long)kread(&(mapping->host));
-    CATCH_DEREF_FAULT();
-%}
+function __p2i :long(page:long)
+{
+    mapping = page? @cast(page, "page", "kernel:nfs")->mapping : 0
+    if (mapping == 0)
+        return 0
+    return @cast(mapping, "address_space", "kernel:nfs")->host
+}
 
 /*Get i_flags from struct page*/
-function __p2i_flag : long (page:long) %{ /* pure */
-    struct page *page = (struct page *)((long)THIS->page);
-    struct address_space *mapping = page? kread(&(page->mapping)) : NULL;
-    struct inode *host = mapping? kread(&(mapping->host)) : NULL;
-
-    if (host == NULL)
-        THIS->__retvalue = -1;
-    else
-        THIS->__retvalue = kread(&(host->i_flags));
-    CATCH_DEREF_FAULT();
-%}
+function __p2i_flag : long (page:long)
+{
+    host = __p2i(page)
+    if (host == 0)
+        return -1
+    return @cast(host, "inode", "kernel:nfs")->i_flags
+}
 
 /*Get i_state from struct page*/
-function __p2i_state :long (page:long) %{ /* pure */
-    struct page *page = (struct page *)((long)THIS->page);
-    struct address_space *mapping = page? kread(&(page->mapping)) : NULL;
-    struct inode *host = mapping? kread(&(mapping->host)) : NULL;
-
-    if (host == NULL)
-        THIS->__retvalue = -1;
-    else
-        THIS->__retvalue = kread(&(host->i_state));
-    CATCH_DEREF_FAULT();
-%}
+function __p2i_state :long (page:long)
+{
+    host = __p2i(page)
+    if (host == 0)
+        return -1
+    return @cast(host, "inode", "kernel:nfs")->i_state
+}
 
 /*Get i_size from struct page*/
-function __p2i_size :long (page:long) %{ /* pure */
-    struct page *page = (struct page *)((long)THIS->page);
-    struct address_space *mapping = page? kread(&(page->mapping)) : NULL;
-    struct inode *host = mapping? kread(&(mapping->host)) : NULL;
-
-    if (host == NULL)
-        THIS->__retvalue = -1;
-    else
-        THIS->__retvalue = kread(&(host->i_size));
-    CATCH_DEREF_FAULT();
-%}
+function __p2i_size :long (page:long)
+{
+    host = __p2i(page)
+    if (host == 0)
+        return -1
+    return @cast(host, "inode", "kernel:nfs")->i_size
+}
 
 /*Get s_flags from struct page*/
-function __p2sb_flag:long (page:long) %{ /* pure */
-    struct page *page = (struct page *)((long)THIS->page);
-    struct address_space *mapping = page? kread(&(page->mapping)) : NULL;
-    struct inode *host = mapping? kread(&(mapping->host)) : NULL;
-	struct super_block *i_sb = host? kread(&(host->i_sb)) : NULL;
-
-    if (i_sb == NULL)
-        THIS->__retvalue = -1;
-    else
-        THIS->__retvalue = kread(&(i_sb->s_flags));
-    CATCH_DEREF_FAULT();
-%}
+function __p2sb_flag:long (page:long)
+{
+    host = __p2i(page)
+    i_sb = host? @cast(host, "inode", "kernel:nfs")->i_sb : 0
+    if (i_sb == 0)
+        return -1
+    return @cast(i_sb, "super_block", "kernel:nfs")->s_flags
+}
 
 function __d_loff_t :long (ppos :long) %{ /* pure */
     loff_t * ppos = (loff_t *) ((long)THIS->ppos);
@@ -209,53 +190,47 @@ function __d_loff_t :long (ppos :long) %{ /* pure */
     CATCH_DEREF_FAULT();
 %}
 
-function __file_inode:long (file:long) %{ /* pure */
-    struct file *file = (struct file *)(long)THIS->file;
-    struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL;
-    if (dentry == NULL)
-        THIS->__retvalue = 0;
-    else
-        THIS->__retvalue = (long)kread(&(dentry->d_inode));
-    CATCH_DEREF_FAULT();
-%}
+function __file_inode:long (file:long)
+{
+%( kernel_v >= "2.6.20" %?
+    dentry = file? @cast(file, "file", "kernel:nfs")->f_path->dentry : 0
+%:
+    dentry = file? @cast(file, "file", "kernel:nfs")->f_dentry : 0
+%)
+    if (dentry == 0)
+        return 0
+    return @cast(dentry, "dentry", "kernel:nfs")->d_inode
+}
 
-function __file_id:long (file:long) %{ /* pure */
-    struct file *file = (struct file *)(long)THIS->file;
-    struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL;
-    if (dentry == NULL)
-        THIS->__retvalue = 0;
-    else {
-        struct inode *d_inode = kread(&(dentry->d_inode));
-        struct super_block *i_sb = kread(&(d_inode->i_sb));
-        THIS->__retvalue = (long)&(i_sb->s_id);
-    }
-    CATCH_DEREF_FAULT();
-%}
+function __file_id:long (file:long)
+{
+    d_inode = __file_inode(file)
+    if (d_inode == 0)
+        return 0
+    return @cast(d_inode, "inode", "kernel:nfs")->i_sb->s_id
+}
 
-function __file_mode:long (file:long) %{ /* pure */
-    struct file *file = (struct file *)(long)THIS->file;
-    struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL;
-    if (dentry == NULL)
-        THIS->__retvalue = 0;
-    else {
-        struct inode *d_inode = kread(&(dentry->d_inode));
-        THIS->__retvalue = kread(&(d_inode->i_mode));
-    }
-    CATCH_DEREF_FAULT();
-%}
+function __file_mode:long (file:long)
+{
+    d_inode = __file_inode(file)
+    if (d_inode == 0)
+        return 0
+    return @cast(d_inode, "inode", "kernel:nfs")->i_mode
+}
 
-function __file_parentname:string (file:long) %{ /* pure */
-    struct file *file = (struct file *)(long)THIS->file;
-    struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL;
-    struct dentry *d_parent = dentry? kread(&(dentry->d_parent)) : NULL;
-    if (d_parent == NULL)
-        strlcpy(THIS->__retvalue, "NULL", MAXSTRINGLEN);
-    else {
-        const unsigned char *name = kread(&(d_parent->d_name.name));
-        deref_string(THIS->__retvalue, name, MAXSTRINGLEN);
-    }
-    CATCH_DEREF_FAULT();
-%}
+function __file_parentname:string (file:long)
+{
+%( kernel_v >= "2.6.20" %?
+    dentry = file? @cast(file, "file", "kernel:nfs")->f_path->dentry : 0
+%:
+    dentry = file? @cast(file, "file", "kernel:nfs")->f_dentry : 0
+%)
+    d_parent = dentry? @cast(dentry, "dentry", "kernel:nfs")->d_parent : 0
+    if (d_parent == 0)
+        return "NULL"
+    name = @cast(d_parent, "dentry", "kernel:nfs")->d_name->name
+    return kernel_string(name)
+}
 
 /*
  * Combination of generic_segment_checks and iov_length functions
@@ -349,8 +324,8 @@ probe nfs.fop.llseek = kernel.function ("nfs_file_llseek") !,
 {
         dev = __file_dev($filp)
         ino = __file_ino($filp)
-	s_id = __file_id($filp)
-	devname = kernel_string(s_id)
+        s_id = __file_id($filp)
+        devname = kernel_string(s_id)
 
         maxbyte = __file_maxbytes($filp)
         offset = $offset