[src/netbsd-3]: src/sys/dev Pull up revision 1.23 (requested by yamt in ticke...

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

details:   https://anonhg.NetBSD.org/src/rev/0019bd30a4f7
branches:  netbsd-3
changeset: 575140:0019bd30a4f7
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 11:57:14 2005 +0000

description:
Pull up revision 1.23 (requested by yamt in ticket #112):
introduce a function to drain bufq and use it where appropriate.

diffstat:

 sys/dev/cgd.c |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r 19fb52413e75 -r 0019bd30a4f7 sys/dev/cgd.c
--- a/sys/dev/cgd.c     Wed Apr 06 11:57:09 2005 +0000
+++ b/sys/dev/cgd.c     Wed Apr 06 11:57:14 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.22 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: cgd.c,v 1.22.2.1 2005/04/06 11:57:14 tron Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.22 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.22.2.1 2005/04/06 11:57:14 tron Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -592,12 +592,7 @@
 
        /* Kill off any queued buffers. */
        s = splbio();
-       while ((bp = BUFQ_GET(&cs->sc_dksc.sc_bufq)) != NULL) {
-               bp->b_error = EIO;
-               bp->b_flags |= B_ERROR;
-               bp->b_resid = bp->b_bcount;
-               biodone(bp);
-       }
+       bufq_drain(&cs->sc_dksc.sc_bufq);
        splx(s);
        bufq_free(&cs->sc_dksc.sc_bufq);