This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
patch: Fix scsi tapset when scsi driver is built into the kernel
- From: Sébastien Dugué <sebastien dot dugue at bull dot net>
- To: systemtap <systemtap at sources dot redhat dot com>
- Date: Wed, 4 Apr 2007 15:41:18 +0200
- Subject: patch: Fix scsi tapset when scsi driver is built into the kernel
Hi,
here is a patch to fix the scsi tapset following PR 3261 resolution.
Now that SystemTap rejects elfutils module "kernel" unless
probe kernel.* is used, fix the scsi tapset for when the scsi driver is built
into the kernel.
Author: Sébastien Dugué <sebastien.dugue@bull.net>
---
tapset/ChangeLog | 4 ++++
tapset/scsi.stp | 20 ++++++++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
Index: src/tapset/scsi.stp
===================================================================
--- src.orig/tapset/scsi.stp 2007-04-04 15:32:31.000000000 +0200
+++ src/tapset/scsi.stp 2007-04-04 15:33:40.000000000 +0200
@@ -16,8 +16,9 @@
%}
/* mid-layer prepare a IO request */
-probe scsi.ioentry
- = module("*").function("scsi_prep_fn@drivers/scsi/scsi_lib.c")
+probe scsi.ioentry =
+ kernel.function("scsi_prep_fn@drivers/scsi/scsi_lib.c")?,
+ module("scsi_mod").function("scsi_prep_fn@drivers/scsi/scsi_lib.c")?
{
if($req->rq_disk == 0) {
disk_major = -1
@@ -31,8 +32,9 @@ probe scsi.ioentry
}
/* Dispatch a command to the low-level driver. */
-probe scsi.iodispatching
- = module("*").function("scsi_dispatch_cmd@drivers/scsi/scsi.c")
+probe scsi.iodispatching =
+ kernel.function("scsi_dispatch_cmd@drivers/scsi/scsi.c")?,
+ module("scsi_mod").function("scsi_dispatch_cmd@drivers/scsi/scsi.c")?
{
host_no = $cmd->device->host->host_no
@@ -47,8 +49,9 @@ probe scsi.iodispatching
}
/* I/O is done by low-level driver*/
-probe scsi.iodone
- = module("*").function("scsi_done@drivers/scsi/scsi.c")
+probe scsi.iodone =
+ kernel.function("scsi_done@drivers/scsi/scsi.c")?,
+ module("scsi_mod").function("scsi_done@drivers/scsi/scsi.c")?
{
host_no = $cmd->device->host->host_no
channel = $cmd->device->channel
@@ -61,8 +64,9 @@ probe scsi.iodone
}
/* mid-layer processes the completed IO */
-probe scsi.iocompleted
- = module("*").function("scsi_io_completion@drivers/scsi/scsi_lib.c")
+probe scsi.iocompleted =
+ kernel.function("scsi_io_completion@drivers/scsi/scsi_lib.c")?,
+ module("scsi_mod").function("scsi_io_completion@drivers/scsi/scsi_lib.c")?
{
host_no = $cmd->device->host->host_no
channel = $cmd->device->channel
Index: src/tapset/ChangeLog
===================================================================
--- src.orig/tapset/ChangeLog 2007-04-02 17:42:05.000000000 +0200
+++ src/tapset/ChangeLog 2007-04-04 15:38:20.000000000 +0200
@@ -1,3 +1,7 @@
+2007-04-04 Sébastien Dugué <sebastien.dugue@bull.net>
+
+ * scsi.stp: Fix for when the scsi driver is built into the kernel.
+
2007-03-30 Frank Ch. Eigler <fche@elastic.org>
PR 1570.