summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniklas <niklas@openbsd.org>2002-03-05 07:46:44 +0000
committerniklas <niklas@openbsd.org>2002-03-05 07:46:44 +0000
commite5f3570410e8eb41e45bc87631a416a10c1a23c1 (patch)
tree418170965b953f6b8200e2ab12b7468b3fecc5f9
parentDeal gracefully with ccb starvation (diff)
downloadwireguard-openbsd-e5f3570410e8eb41e45bc87631a416a10c1a23c1.tar.xz
wireguard-openbsd-e5f3570410e8eb41e45bc87631a416a10c1a23c1.zip
doh, thanks mickey!
-rw-r--r--sys/dev/ic/aac.c6
-rw-r--r--sys/dev/ic/gdt_common.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 93166d92129..5662f7a4016 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aac.c,v 1.11 2002/03/05 06:51:39 niklas Exp $ */
+/* $OpenBSD: aac.c,v 1.12 2002/03/05 07:46:44 niklas Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -731,8 +731,8 @@ aac_scsi_cmd(xs)
*/
if (ccb == NULL) {
xs->error = XS_DRIVER_STUFFUP;
- xs->flags |= TRY_AGAIN_LATER;
- goto ready;
+ AAC_UNLOCK(sc, lock);
+ return (TRY_AGAIN_LATER);
}
ccb->ac_blockno = blockno;
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index 7b6fd5bb739..297512d18f8 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gdt_common.c,v 1.17 2002/03/05 06:58:54 niklas Exp $ */
+/* $OpenBSD: gdt_common.c,v 1.18 2002/03/05 07:46:44 niklas Exp $ */
/*
* Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -604,8 +604,8 @@ gdt_scsi_cmd(xs)
*/
if (ccb == NULL) {
xs->error = XS_DRIVER_STUFFUP;
- xs->flags |= TRY_AGAIN_LATER;
- goto ready;
+ AAC_UNLOCK(sc, lock);
+ return (TRY_AGAIN_LATER);
}
ccb->gc_blockno = blockno;