[src/trunk]: src/sys/nfs Fix overzealous DIAGNOSTIC check in nfs_disconnect()

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

details:   https://anonhg.NetBSD.org/src/rev/c8a888d172c7
branches:  trunk
changeset: 475885:c8a888d172c7
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Aug 29 16:29:16 1999 +0000

description:
Fix overzealous DIAGNOSTIC check in nfs_disconnect()
(fix pr8249, 8288)

diffstat:

 sys/nfs/nfs_socket.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 1b3c3a05d18e -r c8a888d172c7 sys/nfs/nfs_socket.c
--- a/sys/nfs/nfs_socket.c      Sun Aug 29 10:16:51 1999 +0000
+++ b/sys/nfs/nfs_socket.c      Sun Aug 29 16:29:16 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_socket.c,v 1.52 1999/07/30 09:46:24 fvdl Exp $     */
+/*     $NetBSD: nfs_socket.c,v 1.53 1999/08/29 16:29:16 sommerfeld Exp $       */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -324,12 +324,14 @@
        register struct nfsmount *nmp;
 {
        register struct socket *so;
-
+       int drain = 0;
+       
        if (nmp->nm_so) {
                so = nmp->nm_so;
                nmp->nm_so = (struct socket *)0;
                soshutdown(so, 2);
-               if (nmp->nm_iflag & NFSMNT_DISMNT) {
+               drain = (nmp->nm_iflag & NFSMNT_DISMNT) != 0;
+               if (drain) {
                        /*
                         * soshutdown() above should wake up the current
                         * listener.
@@ -345,7 +347,7 @@
                soclose(so);
        }
 #ifdef DIAGNOSTIC
-       if (nmp->nm_waiters > 0)
+       if (drain && (nmp->nm_waiters > 0))
                panic("nfs_disconnect: waiters left after drain?\n");
 #endif
 }