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

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

details:   https://anonhg.NetBSD.org/src/rev/19fb52413e75
branches:  netbsd-3
changeset: 575139:19fb52413e75
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 11:57:09 2005 +0000

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

diffstat:

 sys/dev/vnd.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r e8970e3fbde3 -r 19fb52413e75 sys/dev/vnd.c
--- a/sys/dev/vnd.c     Wed Apr 06 11:57:03 2005 +0000
+++ b/sys/dev/vnd.c     Wed Apr 06 11:57:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnd.c,v 1.111.10.2 2005/04/03 13:34:16 tron Exp $      */
+/*     $NetBSD: vnd.c,v 1.111.10.3 2005/04/06 11:57:09 tron Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.111.10.2 2005/04/03 13:34:16 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.111.10.3 2005/04/06 11:57:09 tron Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "fs_nfs.h"
@@ -1237,6 +1237,7 @@
        struct proc *p = curproc;               /* XXX */
        int fflags = FREAD;
        int bmaj, cmaj, i, mn;
+       int s;
 
 #ifdef DEBUG
        if (vnddebug & VDB_FOLLOW)
@@ -1257,6 +1258,10 @@
        if ((vnd->sc_flags & VNF_READONLY) == 0)
                fflags |= FWRITE;
 
+       s = splbio();
+       bufq_drain(&vnd->sc_tab);
+       splx(s);
+
        vnd->sc_flags |= VNF_VUNCONF;
        wakeup(&vnd->sc_tab);
        while (vnd->sc_flags & VNF_KTHREAD)