diff options
| author | David Smith <dsmith@redhat.com> | 2010-03-09 15:39:15 -0600 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-03-09 15:39:15 -0600 |
| commit | 595187eb19a18c6f534d1e44aeb912c01b8dc41b (patch) | |
| tree | 951fcaa12eafdbddc2c6b4945a980a70cef72d1a /tapset/scsi.stp | |
| parent | a8350a5d1c6e99d6929d1891767c6ddee015137a (diff) | |
| download | systemtap-steved-595187eb19a18c6f534d1e44aeb912c01b8dc41b.tar.gz systemtap-steved-595187eb19a18c6f534d1e44aeb912c01b8dc41b.tar.xz systemtap-steved-595187eb19a18c6f534d1e44aeb912c01b8dc41b.zip | |
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.
Diffstat (limited to 'tapset/scsi.stp')
| -rw-r--r-- | tapset/scsi.stp | 11 |
1 files changed, 4 insertions, 7 deletions
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 } |