diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2013-01-16 09:21:51 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2013-01-16 09:21:51 +0000 |
| commit | 199c174cf33d9569734d7c7375041ed360c4289c (patch) | |
| tree | a99fdc2f29512ea5cff64eae8013f0a6bd89bf39 | |
| parent | e2ba017ceb6544af31cd5b07a045ab2c2f13561f (diff) | |
Consistently call sr_scsi_done instead of scsi_done.
ok krw@
| -rw-r--r-- | sys/dev/softraid_raid1.c | 6 | ||||
| -rw-r--r-- | sys/dev/softraid_raid6.c | 6 | ||||
| -rw-r--r-- | sys/dev/softraid_raidp.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c index 2393620383f..6d0ed2a49fd 100644 --- a/sys/dev/softraid_raid1.c +++ b/sys/dev/softraid_raid1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid1.c,v 1.37 2013/01/16 07:06:29 jsing Exp $ */ +/* $OpenBSD: softraid_raid1.c,v 1.38 2013/01/16 09:21:50 jsing Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * @@ -612,7 +612,7 @@ sr_raid1_intr(struct buf *bp) wakeup(wu); } } else { - scsi_done(xs); + sr_scsi_done(sd, xs); } if (sd->sd_sync && sd->sd_wu_pending == 0) @@ -628,7 +628,7 @@ bad: wu->swu_flags |= SR_WUF_REBUILDIOCOMP; wakeup(wu); } else { - scsi_done(xs); + sr_scsi_done(sd, xs); } splx(s); diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c index 6279a3069f5..a99c53f8731 100644 --- a/sys/dev/softraid_raid6.c +++ b/sys/dev/softraid_raid6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid6.c,v 1.32 2013/01/16 07:06:29 jsing Exp $ */ +/* $OpenBSD: softraid_raid6.c,v 1.33 2013/01/16 09:21:50 jsing Exp $ */ /* * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org> @@ -840,7 +840,7 @@ sr_raid6_intr(struct buf *bp) } } else { if (xs != NULL) - scsi_done(xs); + sr_scsi_done(sd, xs); else scsi_io_put(&sd->sd_iopool, wu); } @@ -858,7 +858,7 @@ bad: wu->swu_flags |= SR_WUF_REBUILDIOCOMP; wakeup(wu); } else { - scsi_done(xs); + sr_scsi_done(sd, xs); } splx(s); diff --git a/sys/dev/softraid_raidp.c b/sys/dev/softraid_raidp.c index bb5130ef51f..94e59d056f9 100644 --- a/sys/dev/softraid_raidp.c +++ b/sys/dev/softraid_raidp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raidp.c,v 1.29 2013/01/16 07:06:29 jsing Exp $ */ +/* $OpenBSD: softraid_raidp.c,v 1.30 2013/01/16 09:21:50 jsing Exp $ */ /* * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org> @@ -656,7 +656,7 @@ sr_raidp_intr(struct buf *bp) } } else { if (xs != NULL) - scsi_done(xs); + sr_scsi_done(sd, xs); else scsi_io_put(&sd->sd_iopool, wu); } @@ -674,7 +674,7 @@ bad: wu->swu_flags |= SR_WUF_REBUILDIOCOMP; wakeup(wu); } else { - scsi_done(xs); + sr_scsi_done(sd, xs); } splx(s); |