summaryrefslogtreecommitdiffstats
path: root/tapset
diff options
context:
space:
mode:
Diffstat (limited to 'tapset')
-rw-r--r--tapset/ChangeLog4
-rw-r--r--tapset/ioblock.stp5
2 files changed, 7 insertions, 2 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 388c3f5e..98040408 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-17 Tom Zanussi <zanussi@us.ibm.com>
+
+ * ioblock.stp: add null bi_bdev check to bio_devname()
+
2006-07-17 Li Guanglei <guanglei@cn.ibm.com>
* syscalls.stp: make sys_acct, sys_add_key, sys_keyctl
diff --git a/tapset/ioblock.stp b/tapset/ioblock.stp
index 746460cc..484b61f3 100644
--- a/tapset/ioblock.stp
+++ b/tapset/ioblock.stp
@@ -62,11 +62,12 @@ probe ioblock.end
/* Return the block device name */
function bio_devname:string(bio:long)
%{
- char b[BDEVNAME_SIZE];
+ char b[BDEVNAME_SIZE] = "";
struct bio *bp;
bp = (struct bio *) ((unsigned long) THIS->bio);
- bdevname(bp->bi_bdev,b);
+ if (bp->bi_bdev)
+ bdevname(bp->bi_bdev,b);
sprintf(THIS->__retvalue,"%s",b);
%}