[src/netbsd-1-4]: src/sys/dev pull up rev 1.64 from trunk (requested by chs):

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1ef3b896e61
branches:  netbsd-1-4
changeset: 469667:f1ef3b896e61
user:      cgd <cgd%NetBSD.org@localhost>
date:      Fri Nov 05 07:39:39 1999 +0000

description:
pull up rev 1.64 from trunk (requested by chs):
  Fix a dobule-biodone() panic when ccd component buffers have errors.

diffstat:

 sys/dev/ccd.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r fdbe356b8a9a -r f1ef3b896e61 sys/dev/ccd.c
--- a/sys/dev/ccd.c     Fri Nov 05 07:36:55 1999 +0000
+++ b/sys/dev/ccd.c     Fri Nov 05 07:39:39 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ccd.c,v 1.62 1999/03/04 02:38:19 mjacob Exp $  */
+/*     $NetBSD: ccd.c,v 1.62.2.1 1999/11/05 07:39:39 cgd Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -624,8 +624,6 @@
        s = splbio();
        ccdstart(cs, bp);
        splx(s);
-       if (bp->b_flags & B_ERROR)
-               goto done;
        return;
 done:
        biodone(bp);
@@ -677,6 +675,7 @@
                        /* Notify the upper layer we are out of memory. */
                        bp->b_error = ENOMEM;
                        bp->b_flags |= B_ERROR;
+                       biodone(bp);
                        disk_unbusy(&cs->sc_dkdev, 0);
                        return;
                }