Merge sequential casts in the vfs tapset

A few places in this tapset were using a pattern like this:
  i_sb = @cast(foo, "inode")->i_sb
  return @cast(foo, "super_block")->bar

The type of i_sb is already known, so I just merged this to:
  return @cast(foo, "inode")->i_sb->bar

1 files changed, 19 insertions, 35 deletions

diff --git a/tapset/vfs.stp b/tapset/vfs.stp
index 3bb9292d..23d95098 100644
--- a/tapset/vfs.stp
+++ b/tapset/vfs.stp
@@ -74,21 +74,15 @@ function __page_dev:long (page:long)
 	host = __address_inode(page)
 	if (host == -1)
 		return -1
-	else {
-		i_sb = @cast(host, "inode", "kernel")->i_sb
-		return @cast(i_sb, "super_block", "kernel")->s_dev
-	}
+	return @cast(host, "inode", "kernel")->i_sb->s_dev
 }
 
 function __page_bdev:long (page:long)
 {
-        host = __address_inode(page)
-        if (host == -1)
-                return 0
-        else {
-                i_sb = @cast(host, "inode", "kernel")->i_sb
-                return @cast(i_sb, "super_block", "kernel")->s_bdev
-        }
+	host = __address_inode(page)
+	if (host == -1)
+		return 0
+	return @cast(host, "inode", "kernel")->i_sb->s_bdev
 }
 
 function __page_index:long (page:long)
@@ -101,41 +95,31 @@ function __file_dev:long (file:long)
 	d_inode = __file_inode(file)
 	if (d_inode == 0)
 		return 0
-	else {
-		i_sb =  @cast(d_inode, "inode", "kernel")->i_sb
-		return @cast(i_sb, "super_block", "kernel")->s_dev
-	}
+	return @cast(d_inode, "inode", "kernel")->i_sb->s_dev
 }
 
 function __file_bdev:long (file:long)
 {
-        d_inode = __file_inode(file)
-        if (d_inode == 0)
-                return 0
-        else {
-                i_sb =  @cast(d_inode, "inode", "kernel")->i_sb
-                return @cast(i_sb, "super_block", "kernel")->s_bdev
-        }
+	d_inode = __file_inode(file)
+	if (d_inode == 0)
+		return 0
+	return @cast(d_inode, "inode", "kernel")->i_sb->s_bdev
 }
 
 function __file_ino:long (file:long)
 {
-        d_inode = __file_inode(file)
-        if (d_inode == 0)
-                return 0
-        else
-                return  @cast(d_inode, "inode", "kernel")->i_ino
+	d_inode = __file_inode(file)
+	if (d_inode == 0)
+		return 0
+	return @cast(d_inode, "inode", "kernel")->i_ino
 }
 
 function __file_maxbytes:long (file:long)
 {
-        d_inode = __file_inode(file)
-        if (d_inode == 0)
-                return 0
-        else {
-                i_sb =  @cast(d_inode, "inode", "kernel")->i_sb
-                return @cast(i_sb, "super_block", "kernel")->s_maxbytes
-        }
+	d_inode = __file_inode(file)
+	if (d_inode == 0)
+		return 0
+	return @cast(d_inode, "inode", "kernel")->i_sb->s_maxbytes
 }
 
 function __file_filename:string (file:long)
@@ -153,7 +137,7 @@ function __file_filename:string (file:long)
 }
 
 function _get_fopv_size:long (iov:long, nr_segs:long)
-%{
+%{ /* pure */
 	struct iovec *iovp = (struct iovec *)(long)THIS->iov;
 	if (iovp) {
 		int i;