Module Name: src
Committed By: dsl
Date: Wed Dec 9 21:33:00 UTC 2009
Modified Files:
src/sys/arch/xen/xen: xenevt.c
src/sys/compat/svr4: svr4_net.c
src/sys/compat/svr4_32: svr4_32_net.c
src/sys/dev/dmover: dmover_io.c
src/sys/dev/putter: putter.c
src/sys/kern: kern_descrip.c kern_drvctl.c kern_event.c sys_mqueue.c
sys_pipe.c sys_socket.c uipc_socket.c vfs_vnops.c
src/sys/net: bpf.c if_tap.c
src/sys/opencrypto: cryptodev.c
src/sys/sys: file.h socketvar.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/xen/xen/xenevt.c
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/svr4/svr4_net.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/svr4_32/svr4_32_net.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/dmover/dmover_io.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/putter/putter.c
cvs rdiff -u -r1.200 -r1.201 src/sys/kern/kern_descrip.c
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/kern_event.c
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/sys_mqueue.c
cvs rdiff -u -r1.120 -r1.121 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.61 -r1.62 src/sys/kern/sys_socket.c
cvs rdiff -u -r1.194 -r1.195 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.166 -r1.167 src/sys/kern/vfs_vnops.c
cvs rdiff -u -r1.148 -r1.149 src/sys/net/bpf.c
cvs rdiff -u -r1.60 -r1.61 src/sys/net/if_tap.c
cvs rdiff -u -r1.49 -r1.50 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.68 -r1.69 src/sys/sys/file.h
cvs rdiff -u -r1.121 -r1.122 src/sys/sys/socketvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.34 src/sys/arch/xen/xen/xenevt.c:1.35
--- src/sys/arch/xen/xen/xenevt.c:1.34 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/xen/xenevt.c Wed Dec 9 21:32:58 2009
@@ -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);
Index: src/sys/compat/svr4/svr4_net.c
diff -u src/sys/compat/svr4/svr4_net.c:1.56 src/sys/compat/svr4/svr4_net.c:1.57
--- src/sys/compat/svr4/svr4_net.c:1.56 Sat Apr 4 10:12:51 2009
+++ src/sys/compat/svr4/svr4_net.c Wed Dec 9 21:32:58 2009
@@ -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,
};
Index: src/sys/compat/svr4_32/svr4_32_net.c
diff -u src/sys/compat/svr4_32/svr4_32_net.c:1.19 src/sys/compat/svr4_32/svr4_32_net.c:1.20
--- src/sys/compat/svr4_32/svr4_32_net.c:1.19 Sat Apr 4 10:12:51 2009
+++ src/sys/compat/svr4_32/svr4_32_net.c Wed Dec 9 21:32:58 2009
@@ -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,
};
Index: src/sys/dev/dmover/dmover_io.c
diff -u src/sys/dev/dmover/dmover_io.c:1.35 src/sys/dev/dmover/dmover_io.c:1.36
--- src/sys/dev/dmover/dmover_io.c:1.35 Fri May 1 00:15:57 2009
+++ src/sys/dev/dmover/dmover_io.c Wed Dec 9 21:32:58 2009
@@ -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,
};
/*
Index: src/sys/dev/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.24 src/sys/dev/putter/putter.c:1.25
--- src/sys/dev/putter/putter.c:1.24 Mon Dec 7 13:41:44 2009
+++ src/sys/dev/putter/putter.c Wed Dec 9 21:32:59 2009
@@ -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
Index: src/sys/kern/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.200 src/sys/kern/kern_descrip.c:1.201
--- src/sys/kern/kern_descrip.c:1.200 Tue Oct 27 02:58:28 2009
+++ src/sys/kern/kern_descrip.c Wed Dec 9 21:32:59 2009
@@ -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)
{
}
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.29 src/sys/kern/kern_drvctl.c:1.30
--- src/sys/kern/kern_drvctl.c:1.29 Wed Sep 16 16:34:50 2009
+++ src/sys/kern/kern_drvctl.c Wed Dec 9 21:32:59 2009
@@ -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
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.66 src/sys/kern/kern_event.c:1.67
--- src/sys/kern/kern_event.c:1.66 Sat Oct 3 00:14:07 2009
+++ src/sys/kern/kern_event.c Wed Dec 9 21:32:59 2009
@@ -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 =
Index: src/sys/kern/sys_mqueue.c
diff -u src/sys/kern/sys_mqueue.c:1.26 src/sys/kern/sys_mqueue.c:1.27
--- src/sys/kern/sys_mqueue.c:1.26 Sun Nov 1 21:46:09 2009
+++ src/sys/kern/sys_mqueue.c Wed Dec 9 21:32:59 2009
@@ -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[] = {
Index: src/sys/kern/sys_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.120 src/sys/kern/sys_pipe.c:1.121
--- src/sys/kern/sys_pipe.c:1.120 Sun Dec 6 20:26:55 2009
+++ src/sys/kern/sys_pipe.c Wed Dec 9 21:32:59 2009
@@ -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,
};
/*
Index: src/sys/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.61 src/sys/kern/sys_socket.c:1.62
--- src/sys/kern/sys_socket.c:1.61 Wed Apr 8 21:02:09 2009
+++ src/sys/kern/sys_socket.c Wed Dec 9 21:32:59 2009
@@ -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,
.fo_kqfilter = soo_kqfilter,
- .fo_drain = fnullop_drain, /* soo_drain, */
+ .fo_abort = soo_abort,
};
/* ARGSUSED */
@@ -260,8 +260,8 @@
}
void
-soo_drain(file_t *fp)
+soo_abort(file_t *fp)
{
- (void)sodrain(fp->f_data);
+ soabortop(fp->f_data);
}
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.194 src/sys/kern/uipc_socket.c:1.195
--- src/sys/kern/uipc_socket.c:1.194 Sat Nov 7 07:27:49 2009
+++ src/sys/kern/uipc_socket.c Wed Dec 9 21:32:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.194 2009/11/07 07:27:49 cegger Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.195 2009/12/09 21:32:59 dsl Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.194 2009/11/07 07:27:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.195 2009/12/09 21:32:59 dsl Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -1624,18 +1624,16 @@
return error;
}
-int
-sodrain(struct socket *so)
+void
+soabortop(struct socket *so)
{
- int error;
-
+#if 0 /* ad@ wrote this, then disabled it as 'not working' */
solock(so);
- so->so_state |= SS_ISDRAINING;
+ so->so_state |= SS_ISABORTING;
cv_broadcast(&so->so_cv);
- error = soshutdown(so, SHUT_RDWR);
+ soshutdown(so, SHUT_RDWR);
sounlock(so);
-
- return error;
+#endif
}
void
Index: src/sys/kern/vfs_vnops.c
diff -u src/sys/kern/vfs_vnops.c:1.166 src/sys/kern/vfs_vnops.c:1.167
--- src/sys/kern/vfs_vnops.c:1.166 Sun May 17 05:54:42 2009
+++ src/sys/kern/vfs_vnops.c Wed Dec 9 21:32:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnops.c,v 1.166 2009/05/17 05:54:42 yamt Exp $ */
+/* $NetBSD: vfs_vnops.c,v 1.167 2009/12/09 21:32:59 dsl Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.166 2009/05/17 05:54:42 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.167 2009/12/09 21:32:59 dsl Exp $");
#include "veriexec.h"
@@ -122,7 +122,7 @@
.fo_stat = vn_statfile,
.fo_close = vn_closefile,
.fo_kqfilter = vn_kqfilter,
- .fo_drain = fnullop_drain,
+ .fo_abort = fnullop_abort,
};
/*
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.148 src/sys/net/bpf.c:1.149
--- src/sys/net/bpf.c:1.148 Mon Nov 23 02:13:48 2009
+++ src/sys/net/bpf.c Wed Dec 9 21:32:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.148 2009/11/23 02:13:48 rmind Exp $ */
+/* $NetBSD: bpf.c,v 1.149 2009/12/09 21:32:59 dsl Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.148 2009/11/23 02:13:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.149 2009/12/09 21:32:59 dsl Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -165,7 +165,7 @@
.fo_stat = bpf_stat,
.fo_close = bpf_close,
.fo_kqfilter = bpf_kqfilter,
- .fo_drain = fnullop_drain,
+ .fo_abort = fnullop_abort,
};
dev_type_open(bpfopen);
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.60 src/sys/net/if_tap.c:1.61
--- src/sys/net/if_tap.c:1.60 Sun Nov 29 10:44:23 2009
+++ src/sys/net/if_tap.c Wed Dec 9 21:32:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.60 2009/11/29 10:44:23 plunky Exp $ */
+/* $NetBSD: if_tap.c,v 1.61 2009/12/09 21:32:59 dsl Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.60 2009/11/29 10:44:23 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.61 2009/12/09 21:32:59 dsl Exp $");
#if defined(_KERNEL_OPT)
#include "bpfilter.h"
@@ -161,7 +161,7 @@
.fo_stat = tap_fops_stat,
.fo_close = tap_fops_close,
.fo_kqfilter = tap_fops_kqfilter,
- .fo_drain = fnullop_drain,
+ .fo_abort = fnullop_abort,
};
/* Helper for cloning open() */
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.49 src/sys/opencrypto/cryptodev.c:1.50
--- src/sys/opencrypto/cryptodev.c:1.49 Sat Apr 11 23:05:26 2009
+++ src/sys/opencrypto/cryptodev.c Wed Dec 9 21:32:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.49 2009/04/11 23:05:26 christos Exp $ */
+/* $NetBSD: cryptodev.c,v 1.50 2009/12/09 21:32:59 dsl Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.49 2009/04/11 23:05:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.50 2009/12/09 21:32:59 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,7 +157,7 @@
.fo_stat = cryptof_stat,
.fo_close = cryptof_close,
.fo_kqfilter = fnullop_kqfilter,
- .fo_drain = fnullop_drain,
+ .fo_abort = fnullop_abort,
};
struct csession *cryptodev_csefind(struct fcrypt *, u_int);
Index: src/sys/sys/file.h
diff -u src/sys/sys/file.h:1.68 src/sys/sys/file.h:1.69
--- src/sys/sys/file.h:1.68 Sun May 17 05:54:42 2009
+++ src/sys/sys/file.h Wed Dec 9 21:33:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: file.h,v 1.68 2009/05/17 05:54:42 yamt Exp $ */
+/* $NetBSD: file.h,v 1.69 2009/12/09 21:33:00 dsl Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
int (*fo_stat) (struct file *, struct stat *);
int (*fo_close) (struct file *);
int (*fo_kqfilter) (struct file *, struct knote *);
- void (*fo_drain) (struct file *);
+ void (*fo_abort) (struct file *);
void (*fo_spare1) (void);
void (*fo_spare2) (void);
} *f_ops;
@@ -162,7 +162,7 @@
int fbadop_ioctl(struct file *, u_long, void *);
int fbadop_close(struct file *);
int fbadop_stat(struct file *, struct stat *);
-void fnullop_drain(struct file *);
+void fnullop_abort(struct file *);
#endif /* _KERNEL */
Index: src/sys/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.121 src/sys/sys/socketvar.h:1.122
--- src/sys/sys/socketvar.h:1.121 Fri Sep 11 22:06:29 2009
+++ src/sys/sys/socketvar.h Wed Dec 9 21:33:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.121 2009/09/11 22:06:29 dyoung Exp $ */
+/* $NetBSD: socketvar.h,v 1.122 2009/12/09 21:33:00 dsl Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -198,7 +198,7 @@
#define SS_CANTSENDMORE 0x010 /* can't send more data to peer */
#define SS_CANTRCVMORE 0x020 /* can't receive more data from peer */
#define SS_RCVATMARK 0x040 /* at mark on input */
-#define SS_ISDRAINING 0x080 /* draining fd references */
+#define SS_ISABORTING 0x080 /* aborting fd references - close() */
#define SS_ISDISCONNECTED 0x800 /* socket disconnected from peer */
#define SS_ASYNC 0x100 /* async i/o notify */
@@ -256,7 +256,7 @@
int soo_kqfilter(file_t *, struct knote *);
int soo_close(file_t *);
int soo_stat(file_t *, struct stat *);
-void soo_drain(file_t *);
+void soo_abort(file_t *);
void sbappend(struct sockbuf *, struct mbuf *);
void sbappendstream(struct sockbuf *, struct mbuf *);
int sbappendaddr(struct sockbuf *, const struct sockaddr *, struct mbuf *,
@@ -313,7 +313,7 @@
int sosetopt(struct socket *, struct sockopt *);
int so_setsockopt(struct lwp *, struct socket *, int, int, const void *, size_t);
int soshutdown(struct socket *, int);
-int sodrain(struct socket *);
+void soabortop(struct socket *);
void sowakeup(struct socket *, struct sockbuf *, int);
int sockargs(struct mbuf **, const void *, size_t, int);
int sopoll(struct socket *, int);
