diff options
| author | Wenji Huang <wenji.huang@oracle.com> | 2008-10-28 02:43:23 -0400 |
|---|---|---|
| committer | Wenji Huang <wenji.huang@oracle.com> | 2008-10-28 02:43:23 -0400 |
| commit | b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4 (patch) | |
| tree | 31318b672f7188fb48f4e7e56f056d1b8403bb44 /tapset/scsi.stp | |
| parent | ed70d5b028bf8af776380deda5e6a75857c41c28 (diff) | |
| download | systemtap-steved-b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4.tar.gz systemtap-steved-b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4.tar.xz systemtap-steved-b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4.zip | |
Correct ioblock and scsi tapset for 2.6.28.
Diffstat (limited to 'tapset/scsi.stp')
| -rw-r--r-- | tapset/scsi.stp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tapset/scsi.stp b/tapset/scsi.stp index 7787b6d6..ed96b430 100644 --- a/tapset/scsi.stp +++ b/tapset/scsi.stp @@ -87,7 +87,14 @@ probe scsi.iocompleted function scsi_timer_pending:long(var:long) %{ /* pure */ struct scsi_cmnd *cmd = (struct scsi_cmnd *)((long)THIS->var); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) THIS->__retvalue = timer_pending(&cmd->eh_timeout); /* FIXME: deref hazard! */ +#else + struct request *req = (struct request *)kread(&cmd->request); + struct request_queue *rq = (struct request_queue *)kread(&req->q); + THIS->__retvalue = timer_pending(&rq->timeout); /* FIXME: deref hazard! */ + CATCH_DEREF_FAULT(); +#endif %} function get_devstate_from_req:long(var:long) |