[src/netbsd-1-5]: src/sys/ufs/mfs Pullup 1.29 and 1.30 [simonb]:

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

details:   https://anonhg.NetBSD.org/src/rev/284a174a5d90
branches:  netbsd-1-5
changeset: 489758:284a174a5d90
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Oct 17 00:53:35 2000 +0000

description:
Pullup 1.29 and 1.30 [simonb]:
In mfs_start(), move the handling of outstanding I/O requests to before
the check for unmounting the filesystem.

Appears to fix kern/10122 from Hitoshi Matsunawa.

diffstat:

 sys/ufs/mfs/mfs_vfsops.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 6d6e5ac0164f -r 284a174a5d90 sys/ufs/mfs/mfs_vfsops.c
--- a/sys/ufs/mfs/mfs_vfsops.c  Tue Oct 17 00:48:51 2000 +0000
+++ b/sys/ufs/mfs/mfs_vfsops.c  Tue Oct 17 00:53:35 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mfs_vfsops.c,v 1.28 2000/05/19 20:42:21 thorpej Exp $  */
+/*     $NetBSD: mfs_vfsops.c,v 1.28.4.1 2000/10/17 00:53:35 tv Exp $   */
 
 /*
  * Copyright (c) 1989, 1990, 1993, 1994
@@ -302,6 +302,11 @@
 
        base = mfsp->mfs_baseoff;
        while (BUFQ_FIRST(&mfsp->mfs_buflist) != (struct buf *) -1) {
+               while ((bp = BUFQ_FIRST(&mfsp->mfs_buflist)) != NULL) {
+                       BUFQ_REMOVE(&mfsp->mfs_buflist, bp);
+                       mfs_doio(bp, base);
+                       wakeup((caddr_t)bp);
+               }
                /*
                 * If a non-ignored signal is received, try to unmount.
                 * If that fails, or the filesystem is already in the
@@ -317,11 +322,6 @@
                        continue;
                }
 
-               while ((bp = BUFQ_FIRST(&mfsp->mfs_buflist)) != NULL) {
-                       BUFQ_REMOVE(&mfsp->mfs_buflist, bp);
-                       mfs_doio(bp, base);
-                       wakeup((caddr_t)bp);
-               }
                sleepreturn = tsleep(vp, mfs_pri, "mfsidl", 0);
        }
        return (sleepreturn);