summaryrefslogtreecommitdiffstats
path: root/sys/dev/streams
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2006-07-19 18:26:09 +0000
committerjhb <jhb@FreeBSD.org>2006-07-19 18:26:09 +0000
commit35822ba820f283012cee418aab3b6e7111e888b8 (patch)
treed7dacebb4a85fa8bfcbad7b4d513ea0e3b750aa9 /sys/dev/streams
parentd4972b28e6465e6011b5e0dc4b8f36f604f685e5 (diff)
downloadFreeBSD-src-35822ba820f283012cee418aab3b6e7111e888b8.zip
FreeBSD-src-35822ba820f283012cee418aab3b6e7111e888b8.tar.gz
Initialize svr4_head during MOD_LOAD rather than on demand.
Diffstat (limited to 'sys/dev/streams')
-rw-r--r--sys/dev/streams/streams.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index e303be4..98a600b 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -70,9 +70,6 @@ static d_open_t streamsopen;
struct svr4_sockcache_head svr4_head;
-/* Initialization flag (set/queried by svr4_mod LKM) */
-int svr4_str_initialized = 0;
-
/*
* Device minor numbers
*/
@@ -122,7 +119,7 @@ streams_modevent(module_t mod, int type, void *unused)
{
switch (type) {
case MOD_LOAD:
- /* XXX should make sure it isn't already loaded first */
+ TAILQ_INIT(&svr4_head);
dt_ptm = make_dev(&streams_cdevsw, dev_ptm, 0, 0, 0666,
"ptm");
dt_arp = make_dev(&streams_cdevsw, dev_arp, 0, 0, 0666,
@@ -382,14 +379,6 @@ svr4_delete_socket(p, fp)
struct svr4_sockcache_entry *e;
void *cookie = ((struct socket *)fp->f_data)->so_emuldata;
- while (svr4_str_initialized != 2) {
- if (atomic_cmpset_acq_int(&svr4_str_initialized, 0, 1)) {
- TAILQ_INIT(&svr4_head);
- atomic_store_rel_int(&svr4_str_initialized, 2);
- }
- return;
- }
-
TAILQ_FOREACH(e, &svr4_head, entries)
if (e->p == p && e->cookie == cookie) {
TAILQ_REMOVE(&svr4_head, e, entries);
OpenPOWER on IntegriCloud