From 65dd4b7405baeee812f6d41f0ee74824b601a47a Mon Sep 17 00:00:00 2001 From: David Smith Date: Wed, 7 Apr 2010 16:02:24 -0500 Subject: Added kernel_pointer()/set_kernel_pointer() tapset functions. * tapset/conversions.stp (kernel_pointer): New function. * tapset/conversions-guru.stp (set_kernel_pointer): Ditto. * testsuite/buildok/conversions-embedded.stp: Added kernel_pointer() test. * testsuite/buildok/conversions.stp: Ditto. * testsuite/buildok/set_kernel.stp: Added set_kernel_pointer() test. * tapset/nfs.stp: Removed __d_loff_t() function. Uses new kernel_pointer() function instead. * testsuite/buildok/nfs-embedded.stp: Removed __d_loff_t() test. --- tapset/nfs.stp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'tapset/nfs.stp') diff --git a/tapset/nfs.stp b/tapset/nfs.stp index 2fc05128..e80ba0de 100644 --- a/tapset/nfs.stp +++ b/tapset/nfs.stp @@ -134,16 +134,6 @@ function __p2sb_flag:long (page:long) 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); - - if (ppos == NULL) - THIS->__retvalue = -1; - else - THIS->__retvalue = kread(ppos); - CATCH_DEREF_FAULT(); -%} - function __file_inode:long (file:long) { %( kernel_v >= "2.6.20" %? @@ -718,7 +708,7 @@ probe nfs.fop.sendfile = kernel.function("nfs_file_sendfile") !, devname = kernel_string(s_id) count = $count - ppos = __d_loff_t($ppos) + ppos = $ppos ? kernel_pointer($ppos) : -1 cache_valid = __nfsi_cache_valid(__file_inode($filp)) cache_time = __nfsi_rcache_time(__file_inode($filp)) -- cgit