[src/netbsd-7]: src/sys/kern Pull up following revision(s) (requested by chri...

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

details:   https://anonhg.NetBSD.org/src/rev/c3edcc1d99f3
branches:  netbsd-7
changeset: 799194:c3edcc1d99f3
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Apr 14 04:44:41 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #678):
        sys/kern/uipc_usrreq.c: revision 1.175
PR/39918: ITOH Yasufumi: Replace KASSERT with continue, since the file
descriptor can be closed since closef() does not pay attention to FDEFER.
XXX: Pullup-7

diffstat:

 sys/kern/uipc_usrreq.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 807b90a9a4c7 -r c3edcc1d99f3 sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c    Tue Apr 14 04:39:58 2015 +0000
+++ b/sys/kern/uipc_usrreq.c    Tue Apr 14 04:44:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_usrreq.c,v 1.169.2.2 2015/02/04 06:29:07 snj Exp $        */
+/*     $NetBSD: uipc_usrreq.c,v 1.169.2.3 2015/04/14 04:44:41 snj Exp $        */
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.169.2.2 2015/02/04 06:29:07 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.169.2.3 2015/04/14 04:44:41 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1710,7 +1710,14 @@
                        if ((fp->f_flag & FDEFER) != 0) {
                                atomic_and_uint(&fp->f_flag, ~FDEFER);
                                unp_defer--;
-                               KASSERT(fp->f_count != 0);
+                               if (fp->f_count == 0) {
+                                       /*
+                                        * XXX: closef() doesn't pay attention
+                                        * to FDEFER
+                                        */
+                                       mutex_exit(&fp->f_lock);
+                                       continue;
+                               }
                        } else {
                                if (fp->f_count == 0 ||
                                    (fp->f_flag & FMARK) != 0 ||