[src/trunk]: src/sys Rename fo_drain() to fo_abort(), 'drain' is used to mean...

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

details:   https://anonhg.NetBSD.org/src/rev/e40b36603162
branches:  trunk
changeset: 749814:e40b36603162
user:      dsl <dsl%NetBSD.org@localhost>
date:      Wed Dec 09 21:32:58 2009 +0000

description:
Rename fo_drain() to fo_abort(), 'drain' is used to mean 'wait for output
do drain' in many places, whereas fo_drain() was called in order to force
blocking read()/write() etc calls to return to userspace so that a close()
call from a different thread can complete.
In the sockets code comment out the broken code in the inner function,
it was being called from compat code.

diffstat:

 sys/arch/xen/xen/xenevt.c        |   6 +++---
 sys/compat/svr4/svr4_net.c       |   6 +++---
 sys/compat/svr4_32/svr4_32_net.c |   6 +++---
 sys/dev/dmover/dmover_io.c       |   6 +++---
 sys/dev/putter/putter.c          |   6 +++---
 sys/kern/kern_descrip.c          |   8 ++++----
 sys/kern/kern_drvctl.c           |   6 +++---
 sys/kern/kern_event.c            |   6 +++---
 sys/kern/sys_mqueue.c            |   6 +++---
 sys/kern/sys_pipe.c              |   6 +++---
 sys/kern/sys_socket.c            |  10 +++++-----
 sys/kern/uipc_socket.c           |  18 ++++++++----------
 sys/kern/uipc_syscalls.c         |   6 +++---
 sys/kern/vfs_vnops.c             |   6 +++---
 sys/net/bpf.c                    |   6 +++---
 sys/net/if_tap.c                 |   6 +++---
 sys/opencrypto/cryptodev.c       |   6 +++---
 sys/sys/file.h                   |   6 +++---
 sys/sys/socketvar.h              |   8 ++++----
 19 files changed, 66 insertions(+), 68 deletions(-)

diffs (truncated from 558 to 300 lines):

diff -r 1593412fc6c0 -r e40b36603162 sys/arch/xen/xen/xenevt.c
--- a/sys/arch/xen/xen/xenevt.c Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/arch/xen/xen/xenevt.c Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xenevt.c,v 1.34 2009/10/19 18:41:11 bouyer Exp $      */
+/*      $NetBSD: xenevt.c,v 1.35 2009/12/09 21:32:58 dsl Exp $      */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.34 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.35 2009/12/09 21:32:58 dsl Exp $");
 
 #include "opt_xen.h"
 #include <sys/param.h>
@@ -81,7 +81,7 @@
        .fo_stat = fbadop_stat,
        .fo_close = xenevt_fclose,
        .fo_kqfilter = /* xenevt_fkqfilter */ fnullop_kqfilter,
-       .fo_drain = fnullop_drain,
+       .fo_abort = fnullop_abort,
 };
 
 dev_type_open(xenevtopen);
diff -r 1593412fc6c0 -r e40b36603162 sys/compat/svr4/svr4_net.c
--- a/sys/compat/svr4/svr4_net.c        Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/compat/svr4/svr4_net.c        Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svr4_net.c,v 1.56 2009/04/04 10:12:51 ad Exp $ */
+/*     $NetBSD: svr4_net.c,v 1.57 2009/12/09 21:32:58 dsl Exp $        */
 
 /*-
  * Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.56 2009/04/04 10:12:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.57 2009/12/09 21:32:58 dsl Exp $");
 
 #define COMPAT_SVR4 1
 
@@ -108,7 +108,7 @@
        .fo_stat = soo_stat,
        .fo_close = svr4_soo_close,
        .fo_kqfilter = soo_kqfilter,
-       .fo_drain = soo_drain,
+       .fo_abort = soo_abort,
 };
 
 
diff -r 1593412fc6c0 -r e40b36603162 sys/compat/svr4_32/svr4_32_net.c
--- a/sys/compat/svr4_32/svr4_32_net.c  Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/compat/svr4_32/svr4_32_net.c  Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svr4_32_net.c,v 1.19 2009/04/04 10:12:51 ad Exp $       */
+/*     $NetBSD: svr4_32_net.c,v 1.20 2009/12/09 21:32:58 dsl Exp $      */
 
 /*-
  * Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.19 2009/04/04 10:12:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.20 2009/12/09 21:32:58 dsl Exp $");
 
 #define COMPAT_SVR4 1
 
@@ -102,7 +102,7 @@
        .fo_poll = soo_poll,
        .fo_stat = soo_stat,
        .fo_close = svr4_soo_close,
-       .fo_drain = soo_drain,
+       .fo_abort = soo_abort,
 };
 
 
diff -r 1593412fc6c0 -r e40b36603162 sys/dev/dmover/dmover_io.c
--- a/sys/dev/dmover/dmover_io.c        Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/dev/dmover/dmover_io.c        Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dmover_io.c,v 1.35 2009/05/01 00:15:57 nonaka Exp $    */
+/*     $NetBSD: dmover_io.c,v 1.36 2009/12/09 21:32:58 dsl Exp $       */
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.35 2009/05/01 00:15:57 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.36 2009/12/09 21:32:58 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -761,7 +761,7 @@
        .fo_stat = dmio_stat,
        .fo_close = dmio_close,
        .fo_kqfilter = fnullop_kqfilter,
-       .fo_drain = fnullop_drain,
+       .fo_abort = fnullop_abort,
 };
 
 /*
diff -r 1593412fc6c0 -r e40b36603162 sys/dev/putter/putter.c
--- a/sys/dev/putter/putter.c   Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/dev/putter/putter.c   Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: putter.c,v 1.24 2009/12/07 13:41:44 pooka Exp $        */
+/*     $NetBSD: putter.c,v 1.25 2009/12/09 21:32:59 dsl Exp $  */
 
 /*
  * Copyright (c) 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.24 2009/12/07 13:41:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.25 2009/12/09 21:32:59 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -206,7 +206,7 @@
        .fo_stat = putter_fop_stat,
        .fo_close = putter_fop_close,
        .fo_kqfilter = putter_fop_kqfilter,
-       .fo_drain = fnullop_drain,
+       .fo_abort = fnullop_abort,
 };
 
 static int
diff -r 1593412fc6c0 -r e40b36603162 sys/kern/kern_descrip.c
--- a/sys/kern/kern_descrip.c   Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/kern/kern_descrip.c   Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_descrip.c,v 1.200 2009/10/27 02:58:28 rmind Exp $ */
+/*     $NetBSD: kern_descrip.c,v 1.201 2009/12/09 21:32:59 dsl Exp $   */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.200 2009/10/27 02:58:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.201 2009/12/09 21:32:59 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -624,7 +624,7 @@
                }
 
                /* Try to drain out descriptor references. */
-               (*fp->f_ops->fo_drain)(fp);
+               (*fp->f_ops->fo_abort)(fp);
                mutex_enter(&fdp->fd_lock);
 
                /*
@@ -1787,7 +1787,7 @@
 }
 
 void
-fnullop_drain(file_t *fp)
+fnullop_abort(file_t *fp)
 {
 
 }
diff -r 1593412fc6c0 -r e40b36603162 sys/kern/kern_drvctl.c
--- a/sys/kern/kern_drvctl.c    Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/kern/kern_drvctl.c    Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.29 2009/09/16 16:34:50 dyoung Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.30 2009/12/09 21:32:59 dsl Exp $ */
 
 /*
  * Copyright (c) 2004
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.29 2009/09/16 16:34:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.30 2009/12/09 21:32:59 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,7 +90,7 @@
        .fo_stat = drvctl_stat,
        .fo_close = drvctl_close,
        .fo_kqfilter = fnullop_kqfilter,
-       .fo_drain = fnullop_drain,
+       .fo_abort = fnullop_abort,
 };
 
 #define MAXLOCATORS 100
diff -r 1593412fc6c0 -r e40b36603162 sys/kern/kern_event.c
--- a/sys/kern/kern_event.c     Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/kern/kern_event.c     Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_event.c,v 1.66 2009/10/03 00:14:07 elad Exp $     */
+/*     $NetBSD: kern_event.c,v 1.67 2009/12/09 21:32:59 dsl Exp $      */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.66 2009/10/03 00:14:07 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.67 2009/12/09 21:32:59 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -115,7 +115,7 @@
        .fo_stat = kqueue_stat,
        .fo_close = kqueue_close,
        .fo_kqfilter = kqueue_kqfilter,
-       .fo_drain = fnullop_drain,
+       .fo_abort = fnullop_abort,
 };
 
 static const struct filterops kqread_filtops =
diff -r 1593412fc6c0 -r e40b36603162 sys/kern/sys_mqueue.c
--- a/sys/kern/sys_mqueue.c     Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/kern/sys_mqueue.c     Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_mqueue.c,v 1.26 2009/11/01 21:46:09 rmind Exp $    */
+/*     $NetBSD: sys_mqueue.c,v 1.27 2009/12/09 21:32:59 dsl Exp $      */
 
 /*
  * Copyright (c) 2007-2009 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.26 2009/11/01 21:46:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.27 2009/12/09 21:32:59 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -102,7 +102,7 @@
        .fo_stat = mq_stat_fop,
        .fo_close = mq_close_fop,
        .fo_kqfilter = fnullop_kqfilter,
-       .fo_drain = fnullop_drain,
+       .fo_abort = fnullop_abort,
 };
 
 static const struct syscall_package mqueue_syscalls[] = {
diff -r 1593412fc6c0 -r e40b36603162 sys/kern/sys_pipe.c
--- a/sys/kern/sys_pipe.c       Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/kern/sys_pipe.c       Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_pipe.c,v 1.120 2009/12/06 20:26:55 dsl Exp $       */
+/*     $NetBSD: sys_pipe.c,v 1.121 2009/12/09 21:32:59 dsl Exp $       */
 
 /*-
  * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.120 2009/12/06 20:26:55 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.121 2009/12/09 21:32:59 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,7 +119,7 @@
        .fo_stat = pipe_stat,
        .fo_close = pipe_close,
        .fo_kqfilter = pipe_kqfilter,
-       .fo_drain = fnullop_drain,
+       .fo_abort = fnullop_abort,
 };
 
 /*
diff -r 1593412fc6c0 -r e40b36603162 sys/kern/sys_socket.c
--- a/sys/kern/sys_socket.c     Wed Dec 09 20:26:12 2009 +0000
+++ b/sys/kern/sys_socket.c     Wed Dec 09 21:32:58 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_socket.c,v 1.61 2009/04/08 21:02:09 ad Exp $       */
+/*     $NetBSD: sys_socket.c,v 1.62 2009/12/09 21:32:59 dsl Exp $      */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.61 2009/04/08 21:02:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.62 2009/12/09 21:32:59 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +89,7 @@
        .fo_stat = soo_stat,
        .fo_close = soo_close,