From 595187eb19a18c6f534d1e44aeb912c01b8dc41b Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 9 Mar 2010 15:39:15 -0600
Subject: PR 11338 (partial): Used '@defined()' in task, dentry, and scsi
 tapsets.

* tapset/task.stp: Used '@defined()' to remove kernel version checks.
* tapset/dentry.stp: Ditto.
* tapset/scsi.stp: Ditto.
---
 tapset/scsi.stp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'tapset/scsi.stp')

diff --git a/tapset/scsi.stp b/tapset/scsi.stp
index ba2ac771..2d5cda7a 100644
--- a/tapset/scsi.stp
+++ b/tapset/scsi.stp
@@ -96,13 +96,10 @@ probe scsi.iodispatching
 	device_state_str = describe_device_state(device_state)
 	data_direction = $cmd->sc_data_direction
 	data_direction_str = describe_data_direction(data_direction)
-%( kernel_v >= "2.6.25" %?
-	request_buffer = $cmd->sdb->table->sgl
-	request_bufflen = $cmd->sdb->length
-%:
-	request_buffer = $cmd->request_buffer
-	request_bufflen = $cmd->request_bufflen
-%)
+	request_buffer = (@defined($cmd->sdb->table->sgl)
+	    ? $cmd->sdb->table->sgl : $cmd->request_buffer)
+	request_bufflen = (@defined($cmd->sdb->length)
+	    ? $cmd->sdb->length : $cmd->request_bufflen)
 	req_addr = $cmd->request
 }
 
-- 
cgit