summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2011-07-04 22:55:12 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2011-07-04 22:55:12 +0000
commitf3ea2c6b5ab32dee7127a66aec502d789c33166c (patch)
tree7fe4a7bb9b6b1f85cb25838a614441258ee21f12 /sys
parent58db9026612e598768f5e9b089a1676f5f270bb2 (diff)
Fix debugging prints in softraid(4) so that it can compile with
SR_DEBUG enabled. Broken since r1.227.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/softraid.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 42078b9ec16..f2162d35610 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.235 2011/07/03 15:41:32 matthew Exp $ */
+/* $OpenBSD: softraid.c,v 1.236 2011/07/04 22:55:11 matthew Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -1929,8 +1929,8 @@ sr_scsi_cmd(struct scsi_xfer *xs)
struct sr_discipline *sd;
struct sr_ccb *ccb;
- DNPRINTF(SR_D_CMD, "%s: sr_scsi_cmd: scsibus%d xs: %p "
- "flags: %#x\n", DEVNAME(sc), link->scsibus, xs, xs->flags);
+ DNPRINTF(SR_D_CMD, "%s: sr_scsi_cmd: target %d xs: %p "
+ "flags: %#x\n", DEVNAME(sc), link->target, xs, xs->flags);
sd = sc->sc_dis[link->target];
if (sd == NULL) {
@@ -3086,8 +3086,8 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user)
link = scsi_get_link(sc->sc_scsibus, target, 0);
dev = link->device_softc;
- DNPRINTF(SR_D_IOCTL, "%s: sr device added: %s on scsibus%d\n",
- DEVNAME(sc), dev->dv_xname, sd->sd_link.scsibus);
+ DNPRINTF(SR_D_IOCTL, "%s: sr device added: %s at target %d\n",
+ DEVNAME(sc), dev->dv_xname, sd->sd_target);
for (i = 0, vol = -1; i <= sd->sd_target; i++)
if (sc->sc_dis[i])
@@ -3601,7 +3601,7 @@ sr_raid_start_stop(struct sr_workunit *wu)
struct scsi_start_stop *ss = (struct scsi_start_stop *)xs->cmd;
DNPRINTF(SR_D_DIS, "%s: sr_raid_start_stop\n",
- DEVNAME(sd->sd_sc));
+ DEVNAME(wu->swu_dis->sd_sc));
if (!ss)
return (1);