summaryrefslogtreecommitdiff
path: root/sys/dev/softraid_crypto.c
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2013-03-29 11:46:46 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2013-03-29 11:46:46 +0000
commit47402ef2aa149da75c4b1dba5a74866f852074f1 (patch)
treef23724f075a2b791b99b797373affa842c135295 /sys/dev/softraid_crypto.c
parent8673b11d01f804ff5d1c8397d6a911754b8b9c55 (diff)
sd_wu_pending is only decremented when scsi_done() or scsi_io_put() are
called. As a result, factor out the the sd_sync check/wakeup code and move it to after the scsi_done() call in sr_scsi_done(). Perform the same sd_sync check/wakeup after scsi_io_put() calls (including the addition of some that were previously missed). ok krw@
Diffstat (limited to 'sys/dev/softraid_crypto.c')
-rw-r--r--sys/dev/softraid_crypto.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index bae844b6857..2e8b27436db 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.87 2013/03/02 12:50:01 jsing Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.88 2013/03/29 11:46:45 jsing Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -1334,9 +1334,6 @@ sr_crypto_finish_io(struct sr_workunit *wu)
}
sr_scsi_done(sd, xs);
-
- if (sd->sd_sync && sd->sd_wu_pending == 0)
- wakeup(sd);
}
int