2000-02-03 Roland McGrath <roland@baalperazim.frob.com>

	Complete overhaul of pfinet based on the IPv4 networking code from the
	Linux 2.2.12 kernel sources.  This page describes a single unified set
	of interdependent changes, but there are so many changes that I have
	broken up the log entry into paragraphs based on rough topical
	divisions of the work involved.

	Subset of verbatim Linux 2.2.12 sources imported on a vendor branch.
	* linux-src: New directory, see README for details.
	* README: New file, describes linux-src layout and procedures for
	tracking Linux source updates.

	Light modifications to linux-src files to avoid really bending over
	backwards with the glue macros.  All modifications to files in
	linux-src are conditionalized by #ifdef _HURD_.
	* linux-src/include/linux/net.h [_HURD_] (struct socket): New members
	refcnt and identity; elide members fasync_list, file.
	* linux-src/include/linux/rtnetlink.h [! CONFIG_RTNETLINK]
	(rtnl_shlock, rtnl_shunlock) [! _HURD_]: Conditionalize contents on
	this, making these no-ops #ifdef _HURD_.
	* linux-src/net/core/dev.c [_HURD_] (dev_ioctl): Don't define the
	function, instead #define it to 0.
	* linux-src/net/ipv4/af_inet.c [_HURD_] (inet_ioctl): Likewise.
	* linux-src/net/ipv4/arp.c [_HURD_] (arp_ioctl): Likewise.
	* linux-src/net/ipv4/udp.c [_HURD_] (udp_ioctl): Likewise.
	* linux-src/net/ipv4/tcp.c [_HURD_] (tcp_ioctl): Likewise.
	[_HURD_] (tcp_tiocinq): New function, TIOCINQ code from tcp_ioctl.
	* linux-src/net/ipv4/devinet.c [_HURD_] (devinet_ioctl): Don't define
	the function, instead #define it to 0.
	[_HURD_] (configure_device): New function, cobbled from SIOCSIFADDR
	and SIOCSIFNETMASK code from devinet_ioctl.

	* glue-include/asm, glue-include/linux: New directories.
	These contain glue kludge headers that replace all of the
	Linux <asm/*.h> headers except checksum.h, and several of
	the Linux <linux/*.h> headers (the remainder come from
	linux-src/include/linux and are mostly unmodified).
	* glue-include/asm/atomic.h: New file, glue replacement header.
	* glue-include/asm/bitops.h: New file, glue replacement header.
	* glue-include/asm/byteorder.h: New file, glue replacement header.
	* glue-include/asm/checksum.h: New file, glue replacement header.
	* glue-include/asm/errno.h: New file, glue replacement header.
	* glue-include/asm/hardirq.h: New file, glue replacement header.
	* glue-include/asm/init.h: New file, glue replacement header.
	* glue-include/asm/segment.h: New file, glue replacement header.
	* glue-include/asm/spinlock.h: New file, glue replacement header.
	* glue-include/asm/system.h: New file, glue replacement header.
	* glue-include/asm/types.h: New file, glue replacement header.
	* glue-include/asm/uaccess.h: New file, glue replacement header.
	* glue-include/linux/autoconf.h: New file, glue replacement header.
	* glue-include/linux/binfmts.h: New file, glue replacement header.
	* glue-include/linux/config.h: New file, glue replacement header.
	* glue-include/linux/errno.h: New file, glue replacement header.
	* glue-include/linux/fcntl.h: New file, glue replacement header.
	* glue-include/linux/fs.h: New file, glue replacement header.
	* glue-include/linux/in.h: New file, glue replacement header.
	* glue-include/linux/in6.h: New file, glue replacement header.
	* glue-include/linux/interrupt.h: New file, glue replacement header.
	* glue-include/linux/ioctl.h: New file, glue replacement header.
	* glue-include/linux/ipv6.h: New file, glue replacement header.
	* glue-include/linux/kernel.h: New file, glue replacement header.
	* glue-include/linux/limits.h: New file, glue replacement header.
	* glue-include/linux/major.h: New file, glue replacement header.
	* glue-include/linux/malloc.h: New file, glue replacement header.
	* glue-include/linux/mm.h: New file, glue replacement header.
	* glue-include/linux/param.h: New file, glue replacement header.
	* glue-include/linux/personality.h: New file, glue replacement header.
	* glue-include/linux/poll.h: New file, glue replacement header.
	* glue-include/linux/proc_fs.h: New file, glue replacement header.
	* glue-include/linux/sched.h: New file, glue replacement header.
	* glue-include/linux/slab.h: New file, glue replacement header.
	* glue-include/linux/socket.h: New file, glue replacement header.
	* glue-include/linux/sockios.h: New file, glue replacement header.
	* glue-include/linux/stat.h: New file, glue replacement header.
	* glue-include/linux/string.h: New file, glue replacement header.
	* glue-include/linux/termios.h: New file, glue replacement header.
	* glue-include/linux/time.h: New file, glue replacement header.
	* glue-include/linux/timer.h: New file, glue replacement header.
	* glue-include/linux/timex.h: New file, glue replacement header.
	* glue-include/linux/types.h: New file, glue replacement header.
	* glue-include/linux/un.h: New file, glue replacement header.
	* glue-include/linux/version.h: New file, glue replacement header.
	* glue-include/linux/wait.h: New file, glue replacement header.

	* kmem_cache.c: New file.  Glue code replaces Linux kmem_cache_t et al.
	* stubs.c: New file.  No-op functions and stub variables for a few
	things the Linux networking code needs to link.

	* Makefile (core-srcs, arch-lib-srcs, ethernet-srcs, ipv4-srcs): New
	variables, listing sources used from linux-src subdirectories.
	(LINUXSRCS): Define using those.
	(SRCS): Remove devices.c; add kmem_cache.c, stubs.c.
	(UNUSEDSRC): Variable removed.
	(vpath %.c): Remove vpath for $(srcdir)/linux-inet directory.
	Add vpaths for $(srcdir)/linux-src subdirectories.
	(CPPFLAGS): Add -D_HURD_SYSTYPE defining it to $(asm_syntax) as a
	double-quoted string.  Add -I's for glue-include and linux-src/include.

	* pfinet.h: Include <sys/socket.h>, and not <linux/netdevice.h>.
	(master_device): Remove decl.
	(global_lock, packet_queue_lock): Remove common defns.
	(global_lock, net_bh_lock): Declare them as externs.
	(struct sockaddr): Remove len member, make address member just a
	struct sockaddr rather than a 0-length array.
	(setup_loopback_device, become_task_protid, become_task): Remove decls.
	(ethernet_initialize): Declare it.
	(input_work_thread): Remove decl.
	(net_bh_thread): Declare it.
	(tcp_readable): Remove decl.
	(tcp_tiocinq): Declare it.

	* config.h: Rewritten based on Linux 2.2.12 set of CONFIG_* options.
	(CONFIG_NET, CONFIG_INET, CONFIG_SKB_LARGE): These are the only
	Linux config options we set.
	(CONFIG_IP_NOSIOCRT): New macro (not a proper config option, but
	used conveniently in the code).
	* ethernet.c (ethernet_set_multi): Take only one parameter.
	Remove assert, since we always get passed IGMP_ALL_HOSTS.
	(ethernet_thread): Make static.
	(ethernet_demuxer): Use __mutex_lock in place of mutex_lock, so as to
	get cthreads instead of linux/spinlock.h glue macros.  Lock
	net_bh_lock instead of global_lock.  Set SKB->protocol with
	eth_type_trans before calling netif_rx.
	(ethernet_initialize): New function, one-time initialization broken
	out of ethernet_open.
	(ethernet_open): Ports setup moved to ethernet_initialize.
	Don't use `errno' to avoid glue conflicts.
	Use get_privileged_ports here to get the master device port, and
	deallocate it after calling device_open.
	(ethernet_xmit): Use assert_perror.  Only one arg to dev_kfree_skb now.
	(setup_ethernet_device): Change initializations for structure changes.
	Call dev_init_buffers and register_netdevice on the device.
	* timer-emul.c (all functions): Use __mutex_lock instead of mutex_lock.
	Adjust for renaming of `prevp' member to `prev' in struct timer_list.
	(mod_timer): New function.
	* socket.c (proto_ops): Variable removed.
	(net_families): New variable replaces it.
	(sock_register): Rewritten for new calling convention, set
	net_families rather than proto_ops.
	(make_sock_user, clean_socketport, sock_alloc, sock_release):
	Functions moved here from misc.c.
	* sched.c (packet_queue_lock): Variable removed.
	(net_bh_lock, net_bh_wakeup): New variables.
	(current): Variable removed (now a macro in the glue headers).
	(interruptible_sleep_on, wake_up_interruptible): Functions removed.
	They are replaced by inlines in the glue headers.
	(become_task, become_task_protid): Functions removed; they are
	replaced by macros in glue-include/linux/sched.h.
	(net_bh_worker): New function.
	* loopback.c: Completely rewritten, mostly copied from linux-2.2.12's
	drivers/net/loopback.c source file.

	* io-ops.c (all functions): Use __mutex_lock in place of mutex_lock.
	(S_io_write): Call ops->sendmsg instead of ops->write,
	which no longer exists.  If O_NONBLOCK is set, set MSG_DONTWAIT in
	msg_flags.
	(S_io_read): Call ops->recvmsg instead of ops->read,
	which no longer exists  If O_NONBLOCK is set, pass MSG_DONTWAIT.
	(S_io_readable): Use USER->sock->data in place of USER->sock->sk.
	For SOCK_STREAM and SOCK_SEQPACKET types, call tcp_tiocinq.
	(S_io_set_all_openmodes, S_io_get_openmodes, S_io_set_some_openmodes,
	S_io_clear_some_openmodes): Member USER->sock->userflags is now
	renamed USER->sock->flags.
	(S_io_select): Completely rewritten using ops->poll.
	(select_wait): Function removed.
	(S_io_stat): Set st_mode to reflect S_IFSOCK.
	* socket-ops.c (all functions): Use __mutex_lock instead of mutex_lock.
	(S_socket_create): Don't set SOCK->ops or call SOCK->ops->create.
	Instead, call net_families[PF_INET]->create.
	(S_socket_listen): Remove extra checks; just call ops->listen.
	(S_socket_accept): Remove extra checks before ops->accept call.
	Avoid use of goto.
	(S_socket_connect): Remove extra checks; just call ops->connect.
	(S_socket_bind): Adjust for struct sock_addr changes.
	(S_socket_create_address): Likewise.
	(S_socket_whatis_address): Likewise.
	(S_socket_connect2): Don't diddle data structures after
	ops->socketpair call.
	(S_socket_getopt): Use sock_getsockopt if LEVEL is SOL_SOCKET.
	Accept any data size, not just sizeof (int).
	(S_socket_setopt): Use sock_setsockopt if LEVEL is SOL_SOCKET.
	(S_socket_send): Always use ops->sendmsg instead of ops->send or
	ops->sendto, which no longer exist.  If O_NONBLOCK is set, set
	MSG_DONTWAIT in msg_flags.
	(S_socket_recv): Always use ops->recvmsg instead of ops->recv, which
	no longer exists.  If O_NONBLOCK is set, set MSG_DONTWAIT in flags.
	Check for error from S_socket_create_address.

	* main.c (find_device): Don't try to set ether_dev.pa_mask (it's gone).
	(main): Don't call init_devices.  Call ethernet_initialize.
	Start net_bh_worker instead of input_work_thread.  Don't call
	setup_loopback_device.  Instead, take global_lock, do prepare_current,
	and then call sk_init, skb_init, inet_proto_init, and net_dev_init.
	Keep global_lock held while calling argp_parse.
	Call arrange_shutdown_notification only after all that.
	Fix error call for "contacting parent" to pass ERR instead of errno.
	* options.c (ADDR): #undef before defining macro.
	(parse_opt): #if 0 out EDESTADDRREQ check (I don't understand it).
	To apply settings, call configure_devices.
	(ADD_ADDR_OPT): #if 0 --address and --netmask options.  Needs fixed.
	* misc.c (make_sock_user, clean_socketport, sock_alloc, sock_release):
	Functions moved to socket.c.
	(sock_release_peer): Function removed.
	(make_sockaddr_port): Use struct sockaddr_storage to size buffer.
	Fix size calculation for new struct sock_addr layout.
	Initialize sa_family and sa_len of new struct sock_addr.

	Remove the old Linux (2.0.??) network stack and the glue code for it.
	* linux-inet, asm, linux: Directories and all files removed.
	Some of the new files in glue-include came from the old glue headers
	in the asm and linux directories, but most were substantially modified.
	* devices.c: File removed.  The equivalent glue is now elsewhere.

1 files changed, 83 insertions, 125 deletions

diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c
index b6831c31..c4cfc253 100644
--- a/pfinet/io-ops.c
+++ b/pfinet/io-ops.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc.
    Written by Michael I. Bushnell, p/BSG.
 
    This file is part of the GNU Hurd.
@@ -19,10 +19,14 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include "pfinet.h"
+
+#include <linux/wait.h>
+#include <linux/socket.h>
+#include <linux/net.h>
+#include <net/sock.h>
+
 #include "io_S.h"
 #include <netinet/in.h>
-#include <linux/wait.h>
-#include <linux-inet/sock.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
@@ -37,15 +41,19 @@ S_io_write (struct sock_user *user,
 	    mach_msg_type_number_t *amount)
 {
   error_t err;
+  struct iovec iov = { data, datalen };
+  struct msghdr m = { msg_name: 0, msg_namelen: 0, msg_flags: 0,
+		      msg_controllen: 0, msg_iov: &iov, msg_iovlen: 1 };
 
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   become_task (user);
-  err = (*user->sock->ops->write) (user->sock, data, datalen,
-				   user->sock->userflags);
-  mutex_unlock (&global_lock);
+  if (user->sock->flags & O_NONBLOCK)
+    m.msg_flags |= MSG_DONTWAIT;
+  err = (*user->sock->ops->sendmsg) (user->sock, &m, datalen, 0);
+  __mutex_unlock (&global_lock);
 
   if (err < 0)
     err = -err;
@@ -67,6 +75,9 @@ S_io_read (struct sock_user *user,
 {
   error_t err;
   int alloced = 0;
+  struct iovec iov;
+  struct msghdr m = { msg_name: 0, msg_namelen: 0, msg_flags: 0,
+		      msg_controllen: 0, msg_iov: &iov, msg_iovlen: 1 };
 
   if (!user)
     return EOPNOTSUPP;
@@ -79,11 +90,16 @@ S_io_read (struct sock_user *user,
       alloced = 1;
     }
 
-  mutex_lock (&global_lock);
+  iov.iov_base = *data;
+  iov.iov_len = amount;
+
+  __mutex_lock (&global_lock);
   become_task (user);
-  err = (*user->sock->ops->read) (user->sock, *data, amount,
-				  user->sock->userflags);
-  mutex_unlock (&global_lock);
+  err = (*user->sock->ops->recvmsg) (user->sock, &m, amount,
+				     ((user->sock->flags & O_NONBLOCK)
+    				      ? MSG_DONTWAIT : 0),
+				     0);
+  __mutex_unlock (&global_lock);
 
   if (err < 0)
     err = -err;
@@ -117,13 +133,13 @@ S_io_readable (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   become_task (user);
 
   /* We need to avoid calling the Linux ioctl routines,
      so here is a rather ugly break of modularity. */
 
-  sk = (struct sock *) user->sock->data;
+  sk = user->sock->sk;
   err = 0;
 
   /* Linux's af_inet.c ioctl routine just calls the protocol-specific
@@ -134,15 +150,7 @@ S_io_readable (struct sock_user *user,
     {
     case SOCK_STREAM:
     case SOCK_SEQPACKET:
-      /* These guts are copied from tcp.c:tcp_ioctl. */
-      if (sk->state == TCP_LISTEN)
-	err = EINVAL;
-      else
-	{
-	  sk->inuse = 1;
-	  *amount = tcp_readable (sk);
-	  release_sock (sk);
-	}
+      err = tcp_tiocinq (sk, amount);
       break;
 
     case SOCK_DGRAM:
@@ -161,7 +169,7 @@ S_io_readable (struct sock_user *user,
       break;
     }
 
-  mutex_unlock (&global_lock);
+  __mutex_unlock (&global_lock);
   return err;
 }
 
@@ -172,12 +180,12 @@ S_io_set_all_openmodes (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   if (bits & O_NONBLOCK)
-    user->sock->userflags |= O_NONBLOCK;
+    user->sock->flags |= O_NONBLOCK;
   else
-    user->sock->userflags &= ~O_NONBLOCK;
-  mutex_unlock (&global_lock);
+    user->sock->flags &= ~O_NONBLOCK;
+  __mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -190,18 +198,18 @@ S_io_get_openmodes (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
-  sk = user->sock->data;
+  __mutex_lock (&global_lock);
+  sk = user->sock->sk;
 
   *bits = 0;
   if (!(sk->shutdown & SEND_SHUTDOWN))
     *bits |= O_WRITE;
   if (!(sk->shutdown & RCV_SHUTDOWN))
     *bits |= O_READ;
-  if (user->sock->userflags & O_NONBLOCK)
+  if (user->sock->flags & O_NONBLOCK)
     *bits |= O_NONBLOCK;
 
-  mutex_unlock (&global_lock);
+  __mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -212,10 +220,10 @@ S_io_set_some_openmodes (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   if (bits & O_NONBLOCK)
-    user->sock->userflags |= O_NONBLOCK;
-  mutex_unlock (&global_lock);
+    user->sock->flags |= O_NONBLOCK;
+  __mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -226,114 +234,62 @@ S_io_clear_some_openmodes (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   if (bits & O_NONBLOCK)
-    user->sock->userflags &= ~O_NONBLOCK;
-  mutex_unlock (&global_lock);
+    user->sock->flags &= ~O_NONBLOCK;
+  __mutex_unlock (&global_lock);
   return 0;
 }
 
 error_t
 S_io_select (struct sock_user *user,
-	     mach_port_t reply, mach_msg_type_name_t reply_type,
+	     mach_port_t reply,
+	     mach_msg_type_name_t reply_type,
 	     int *select_type)
 {
-  int avail = 0;
-  int cancel = 0;
-  int requested_notify = 0;
-  select_table table;
-  struct select_table_elt *elt, *nxt;
+  const int want = *select_type;
+  int avail;
 
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   become_task (user);
 
   /* In Linux, this means (supposedly) that I/O will never be possible.
      That's a lose, so prevent it from happening.  */
-  assert (user->sock->ops->select);
-
-  /* The select function returns one if the specified I/O type is
-     immediately possible.  If it returns zero, then it is not
-     immediately possible, and it has called select_wait.  Eventually
-     it will wakeup the wait queue specified in the select_wait call;
-     at that point we should retry the call. */
+  assert (user->sock->ops->poll);
 
-  for (;;)
+  avail = (*user->sock->ops->poll) ((void *) 0xdeadbeef,
+				    user->sock,
+				    (void *) 0xdeadbead);
+  if ((avail & want) == 0)
     {
-      condition_init (&table.master_condition);
-      table.head = 0;
-
-      if (*select_type & SELECT_READ)
-	avail |= ((*user->sock->ops->select) (user->sock, SEL_IN, &table)
-		  ? SELECT_READ : 0);
-      if (*select_type & SELECT_WRITE)
-	avail |= ((*user->sock->ops->select) (user->sock, SEL_OUT, &table)
-		  ? SELECT_WRITE : 0);
-      if (*select_type & SELECT_URG)
-	avail |= ((*user->sock->ops->select) (user->sock, SEL_EX, &table)
-		  ? SELECT_URG : 0);
-
-      if (!avail)
+      ports_interrupt_self_on_notification (user, reply,
+					    MACH_NOTIFY_DEAD_NAME);
+
+      do
 	{
-	  if (! requested_notify)
+	  /* Block until we are woken or cancelled.  */
+	  interruptible_sleep_on (user->sock->sk->sleep);
+	  if (signal_pending (current)) /* This means we were cancelled.  */
 	    {
-	      ports_interrupt_self_on_notification (user, reply,
-						    MACH_NOTIFY_DEAD_NAME);
-	      requested_notify = 1;
+	      __mutex_unlock (&global_lock);
+	      return EINTR;
 	    }
-	  cancel = hurd_condition_wait (&table.master_condition, &global_lock);
-	}
-
-      /* Drop the conditions implications and structures allocated in the
-	 select table. */
-      for (elt = table.head; elt; elt = nxt)
-	{
-	  condition_unimplies (elt->dependent_condition,
-			       &table.master_condition);
-	  nxt = elt->next;
-	  free (elt);
-	}
-
-      if (avail)
-	{
-	  mutex_unlock (&global_lock);
-	  *select_type = avail;
-	  return 0;
-	}
-
-      if (cancel)
-	{
-	  mutex_unlock (&global_lock);
-	  mach_port_deallocate (mach_task_self (), reply);
-	  return EINTR;
+	  avail = (*user->sock->ops->poll) ((void *) 0xdeadbeef,
+					    user->sock,
+					    (void *) 0xdeadbead);
 	}
+      while ((avail & want) == 0);
     }
-}
 
-/* Establish that the condition in WAIT_ADDRESS should imply
-   the condition in P.  Also, add us to the queue in P so
-   that the relation can be undone at the proper time. */
-void
-select_wait (struct wait_queue **wait_address, select_table *p)
-{
-  struct select_table_elt *elt;
+  /* We got something.  */
+  *select_type = avail;
 
-  /* tcp.c happens to use an uninitalized wait queue;
-     so this special hack is for that. */
-  if (*wait_address == 0)
-    {
-      *wait_address = malloc (sizeof (struct wait_queue));
-      condition_init (&(*wait_address)->c);
-    }
+  __mutex_unlock (&global_lock);
 
-  elt = malloc (sizeof (struct select_table_elt));
-  elt->dependent_condition = &(*wait_address)->c;
-  elt->next = p->head;
-  p->head = elt;
-
-  condition_implies (elt->dependent_condition, &p->master_condition);
+  return 0;
 }
 
 error_t
@@ -349,7 +305,9 @@ S_io_stat (struct sock_user *user,
   st->st_fsid = getpid ();
   st->st_ino = (ino_t) user->sock; /* why not? */
 
+  st->st_mode = S_IFSOCK | ACCESSPERMS;
   st->st_blksize = 512;		/* ???? */
+
   return 0;
 }
 
@@ -375,7 +333,7 @@ S_io_reauthenticate (struct sock_user *user,
   aux_uids = aubuf;
   aux_gids = agbuf;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   newuser = make_sock_user (user->sock, 0, 1);
 
   auth = getauth ();
@@ -408,7 +366,7 @@ S_io_reauthenticate (struct sock_user *user,
   mach_port_move_member (mach_task_self (), newuser->pi.port_right,
 			 pfinet_bucket->portset);
 
-  mutex_unlock (&global_lock);
+  __mutex_unlock (&global_lock);
 
   ports_port_deref (newuser);
 
@@ -440,7 +398,7 @@ S_io_restrict_auth (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
 
   isroot = 0;
   if (user->isroot)
@@ -452,7 +410,7 @@ S_io_restrict_auth (struct sock_user *user,
   *newobject = ports_get_right (newuser);
   *newobject_type = MACH_MSG_TYPE_MAKE_SEND;
   ports_port_deref (newuser);
-  mutex_unlock (&global_lock);
+  __mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -465,12 +423,12 @@ S_io_duplicate (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   newuser = make_sock_user (user->sock, user->isroot, 0);
   *newobject = ports_get_right (newuser);
   *newobject_type = MACH_MSG_TYPE_MAKE_SEND;
   ports_port_deref (newuser);
-  mutex_unlock (&global_lock);
+  __mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -487,14 +445,14 @@ S_io_identity (struct sock_user *user,
   if (!user)
     return EOPNOTSUPP;
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&global_lock);
   if (user->sock->identity == MACH_PORT_NULL)
     {
       err = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
 				&user->sock->identity);
       if (err)
 	{
-	  mutex_unlock (&global_lock);
+	  __mutex_unlock (&global_lock);
 	  return err;
 	}
     }
@@ -505,7 +463,7 @@ S_io_identity (struct sock_user *user,
   *fsystype = MACH_MSG_TYPE_MAKE_SEND;
   *fileno = (ino_t) user->sock;	/* matches S_io_stat above */
 
-  mutex_unlock (&global_lock);
+  __mutex_unlock (&global_lock);
   return 0;
 }