Update server handlers to return kern_return_error to fix -Werror=enum-int-mismatch warnings

MiG expects those to return kern_return_t.
Message-ID: <ZXqbbXpVqQAwd2qv@jupiter.tail36e24.ts.net>

122 files changed, 293 insertions, 293 deletions

diff --git a/acpi/acpi-ops.c b/acpi/acpi-ops.c
index 3bc90de7..1aaec10c 100644
--- a/acpi/acpi-ops.c
+++ b/acpi/acpi-ops.c
@@ -43,7 +43,7 @@ check_permissions (struct protid *master, int flags)
   return entry_check_perms (master->user, e, flags);
 }
 
-error_t
+kern_return_t
 S_acpi_sleep (struct protid *master,
 	      int sleep_state)
 {
@@ -65,7 +65,7 @@ S_acpi_sleep (struct protid *master,
   return err;
 }
 
-error_t
+kern_return_t
 S_acpi_get_pci_irq (struct protid *master,
 		    int bus,
 		    int dev,
diff --git a/boot/boot.c b/boot/boot.c
index f7935697..0d7ae74b 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -2041,7 +2041,7 @@ task_died (mach_port_t name)
 }
 
 /* Handle new task notifications from proc.  */
-error_t
+kern_return_t
 S_mach_notify_new_task (mach_port_t notify,
 			mach_port_t task,
 			mach_port_t parent)
diff --git a/console-client/trans.c b/console-client/trans.c
index e43dec66..27ea5418 100644
--- a/console-client/trans.c
+++ b/console-client/trans.c
@@ -333,7 +333,7 @@ netfs_attempt_lookup (struct iouser *user, struct node *dir,
 }
 
 
-error_t
+kern_return_t
 netfs_S_io_seek (struct protid *user, off_t offset,
 		 int whence, off_t *newoffset)
 {
@@ -363,7 +363,7 @@ io_select_common (struct protid *user, mach_port_t reply,
 }
 
 
-error_t
+kern_return_t
 netfs_S_io_select (struct protid *user, mach_port_t reply,
 		   mach_msg_type_name_t replytype, int *type)
 {
@@ -371,7 +371,7 @@ netfs_S_io_select (struct protid *user, mach_port_t reply,
 }
 
 
-error_t
+kern_return_t
 netfs_S_io_select_timeout (struct protid *user, mach_port_t reply,
 			   mach_msg_type_name_t replytype,
 			   struct timespec ts, int *type)
@@ -573,7 +573,7 @@ netfs_attempt_write (struct iouser *cred, struct node *np,
 }
 
 
-error_t
+kern_return_t
 netfs_S_io_read (struct protid *user,
 		 data_t *data,
 		 mach_msg_type_number_t *datalen,
@@ -592,7 +592,7 @@ netfs_S_io_read (struct protid *user,
 }
 
 
-error_t
+kern_return_t
 netfs_S_io_write (struct protid *user,
 		  const_data_t data,
 		  mach_msg_type_number_t datalen,
diff --git a/console/display.c b/console/display.c
index 071cd993..e4e3fcae 100644
--- a/console/display.c
+++ b/console/display.c
@@ -313,7 +313,7 @@ free_modreqs (struct modreq *mr)
 
 /* A port deleted notification is generated when we deallocate the
    user's notify port before it is dead.  */
-error_t
+kern_return_t
 do_mach_notify_port_deleted (struct port_info *pi, mach_port_t name)
 {
   /* As we cancel the dead-name notification before deallocating the
@@ -322,7 +322,7 @@ do_mach_notify_port_deleted (struct port_info *pi, mach_port_t name)
 }
 
 /* We request dead name notifications for the user ports.  */
-error_t
+kern_return_t
 do_mach_notify_dead_name (struct port_info *pi, mach_port_t dead_name)
 {
   struct notify *notify_port = (struct notify *) pi;
@@ -370,13 +370,13 @@ do_mach_notify_dead_name (struct port_info *pi, mach_port_t dead_name)
   return 0;
 }
 
-error_t
+kern_return_t
 do_mach_notify_port_destroyed (struct port_info *pi, mach_port_t rights)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 do_mach_notify_no_senders (struct port_info *pi, mach_port_mscount_t count)
 {
   return ports_do_mach_notify_no_senders (pi, count);
diff --git a/ext2fs/storeinfo.c b/ext2fs/storeinfo.c
index 40e0f603..3d96d189 100644
--- a/ext2fs/storeinfo.c
+++ b/ext2fs/storeinfo.c
@@ -24,7 +24,7 @@
 #include "ext2fs.h"
 #include "libdiskfs/fs_S.h"
 
-error_t
+kern_return_t
 diskfs_S_file_get_storage_info (struct protid *cred,
 				mach_port_t **ports,
 				mach_msg_type_name_t *ports_type,
diff --git a/fatfs/inode.c b/fatfs/inode.c
index 1004cf05..c38ee0d9 100644
--- a/fatfs/inode.c
+++ b/fatfs/inode.c
@@ -545,7 +545,7 @@ diskfs_truncate (struct node *node, loff_t length)
   return err;
 }
 
-error_t
+kern_return_t
 diskfs_S_file_get_storage_info (struct protid *cred,
 				mach_port_t **ports,
 				mach_msg_type_name_t *ports_type,
diff --git a/fatfs/main.c b/fatfs/main.c
index 5ece199b..da6aa949 100644
--- a/fatfs/main.c
+++ b/fatfs/main.c
@@ -270,7 +270,7 @@ diskfs_readonly_changed (int readonly)
 
 /* FIXME: libdiskfs doesn't lock the parent dir when looking up a node
    for fsys_getfile, so we disable NFS.  */
-error_t
+kern_return_t
 diskfs_S_fsys_getfile (struct diskfs_control *pt,
                       mach_port_t reply, mach_msg_type_name_t reply_type,
                       const uid_t *uids, mach_msg_type_number_t nuids,
diff --git a/isofs/inode.c b/isofs/inode.c
index 6e33f2ee..a2dd047e 100644
--- a/isofs/inode.c
+++ b/isofs/inode.c
@@ -417,7 +417,7 @@ diskfs_set_statfs (struct statfs *st)
   return 0;
 }
 
-error_t
+kern_return_t
 diskfs_S_file_get_storage_info (struct protid *cred,
 				mach_port_t **ports,
 				mach_msg_type_name_t *ports_type,
diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c
index 76b9cb54..32be3411 100644
--- a/libdiskfs/dir-lookup.c
+++ b/libdiskfs/dir-lookup.c
@@ -28,7 +28,7 @@
 #include "fs_S.h"
 
 /* Implement dir_lookup as described in <hurd/fs.defs>. */
-error_t
+kern_return_t
 diskfs_S_dir_lookup (struct protid *dircred,
 		     const_string_t filename,
 		     int flags,
diff --git a/libdiskfs/file-chmod.c b/libdiskfs/file-chmod.c
index df262ea3..13f2cb93 100644
--- a/libdiskfs/file-chmod.c
+++ b/libdiskfs/file-chmod.c
@@ -19,7 +19,7 @@
 #include "fs_S.h"
 
 /* Implement file_chmod as described in <hurd/fs.defs>. */
-error_t
+kern_return_t
 diskfs_S_file_chmod (struct protid *cred,
 	      mode_t mode)
 {
diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c
index 4aa5c166..e11bc0fd 100644
--- a/libdiskfs/file-get-fs-opts.c
+++ b/libdiskfs/file-get-fs-opts.c
@@ -25,7 +25,7 @@
 #include "priv.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 diskfs_S_file_get_fs_options (struct protid *cred, data_t *data,
                               mach_msg_type_number_t *data_len)
 {
diff --git a/libdiskfs/file-getfh.c b/libdiskfs/file-getfh.c
index db120813..140373c4 100644
--- a/libdiskfs/file-getfh.c
+++ b/libdiskfs/file-getfh.c
@@ -25,7 +25,7 @@
 #include "fhandle.h"
 
 /* Return an NFS file handle for CRED in FH & FN_LEN.  */
-error_t
+kern_return_t
 diskfs_S_file_getfh (struct protid *cred, data_t *fh,
                      mach_msg_type_number_t *fh_len)
 {
diff --git a/libdiskfs/file-record-lock.c b/libdiskfs/file-record-lock.c
index a3ce9f42..83a05bbd 100644
--- a/libdiskfs/file-record-lock.c
+++ b/libdiskfs/file-record-lock.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <hurd/fshelp.h>
 
-error_t
+kern_return_t
 diskfs_S_file_record_lock (struct protid *cred,
 			   int cmd,
 			   struct flock64 *lock,
diff --git a/libdiskfs/file-reparent.c b/libdiskfs/file-reparent.c
index bb617d72..fa3479e3 100644
--- a/libdiskfs/file-reparent.c
+++ b/libdiskfs/file-reparent.c
@@ -23,7 +23,7 @@
 #include "priv.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 diskfs_S_file_reparent (struct protid *cred, mach_port_t parent,
 			   mach_port_t *new, mach_msg_type_name_t *new_type)
 {
diff --git a/libdiskfs/fsys-forward.c b/libdiskfs/fsys-forward.c
index f5095941..8068b0d2 100644
--- a/libdiskfs/fsys-forward.c
+++ b/libdiskfs/fsys-forward.c
@@ -28,7 +28,7 @@
    the command line arguments.  If the recipient accepts the request, he
    (or some delegate) should send fsys_startup to REQUESTOR to start the
    filesystem up.  */
-error_t
+kern_return_t
 diskfs_S_fsys_forward (mach_port_t server,
                        mach_port_t reply, mach_msg_type_name_t reply_type,
                        mach_port_t requestor, const_data_t argz,
diff --git a/libdiskfs/fsys-get-children.c b/libdiskfs/fsys-get-children.c
index 81ebf032..27d9d114 100644
--- a/libdiskfs/fsys-get-children.c
+++ b/libdiskfs/fsys-get-children.c
@@ -29,7 +29,7 @@
    or more links in the file system, therefore there is no guarantee
    that a translators name refers to an existing link in the file
    system.  */
-error_t
+kern_return_t
 diskfs_S_fsys_get_children (struct diskfs_control *fsys,
                             mach_port_t reply,
                             mach_msg_type_name_t replytype,
diff --git a/libdiskfs/fsys-get-source.c b/libdiskfs/fsys-get-source.c
index cd151560..c2197a61 100644
--- a/libdiskfs/fsys-get-source.c
+++ b/libdiskfs/fsys-get-source.c
@@ -26,7 +26,7 @@
    appropriate in the context of the translator.  For example, if the
    translator is a filesystem residing on a block device, then SOURCE
    should be the file name of the underlying block device.  */
-error_t
+kern_return_t
 diskfs_S_fsys_get_source (struct diskfs_control *fsys,
                           mach_port_t reply,
                           mach_msg_type_name_t replytype,
diff --git a/libdiskfs/fsys-getfile.c b/libdiskfs/fsys-getfile.c
index 4dadd736..b80c2869 100644
--- a/libdiskfs/fsys-getfile.c
+++ b/libdiskfs/fsys-getfile.c
@@ -26,7 +26,7 @@
 
 /* Return in FILE & FILE_TYPE the file in FSYS corresponding to the NFS file
    handle HANDLE & HANDLE_LEN.  */
-error_t
+kern_return_t
 diskfs_S_fsys_getfile (struct diskfs_control *pt,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
 		       const uid_t *uids, mach_msg_type_number_t nuids,
diff --git a/libdiskfs/fsys-goaway.c b/libdiskfs/fsys-goaway.c
index f716970c..a1a00038 100644
--- a/libdiskfs/fsys-goaway.c
+++ b/libdiskfs/fsys-goaway.c
@@ -24,7 +24,7 @@
 #include "fsys_reply_U.h"
 
 /* Implement fsys_goaway as described in <hurd/fsys.defs>. */
-error_t
+kern_return_t
 diskfs_S_fsys_goaway (struct diskfs_control *pt,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
diff --git a/libdiskfs/fsys-options.c b/libdiskfs/fsys-options.c
index ca646a8d..49d1b18d 100644
--- a/libdiskfs/fsys-options.c
+++ b/libdiskfs/fsys-options.c
@@ -77,7 +77,7 @@ diskfs_S_fsys_set_options (struct diskfs_control *pt,
 }
 
 /* Implement fsys_get_options as described in <hurd/fsys.defs>. */
-error_t
+kern_return_t
 diskfs_S_fsys_get_options (struct diskfs_control *port,
 			   mach_port_t reply,
 			   mach_msg_type_name_t replytype,
diff --git a/libdiskfs/io-identity.c b/libdiskfs/io-identity.c
index 0f3fce0f..2dbd0ae8 100644
--- a/libdiskfs/io-identity.c
+++ b/libdiskfs/io-identity.c
@@ -22,7 +22,7 @@
 #include "io_S.h"
 
 /* Implement io_identity as described in <hurd/io.defs>. */
-error_t
+kern_return_t
 diskfs_S_io_identity (struct protid *cred,
 		      mach_port_t *id,
 		      mach_msg_type_name_t *idtype,
diff --git a/libmachdev/trivfs_server.c b/libmachdev/trivfs_server.c
index 71993f0b..4ce1ed36 100644
--- a/libmachdev/trivfs_server.c
+++ b/libmachdev/trivfs_server.c
@@ -458,7 +458,7 @@ machdev_trivfs_init(int argc, char **argv, mach_port_t bootstrap_resume_task,
 }
 
 /* The system is going down, sync data.  */
-error_t
+kern_return_t
 S_startup_dosync (mach_port_t handle)
 {
   struct port_info *inpi = ports_lookup_port (port_bucket, handle,
diff --git a/libnetfs/dir-link.c b/libnetfs/dir-link.c
index 51af402c..4b1bdb7c 100644
--- a/libnetfs/dir-link.c
+++ b/libnetfs/dir-link.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_link (struct protid *diruser, struct protid *fileuser,
 		  const_string_t name, int excl)
 {
diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c
index 23cc1fe1..97732a4e 100644
--- a/libnetfs/dir-lookup.c
+++ b/libnetfs/dir-lookup.c
@@ -27,7 +27,7 @@
 #include "callbacks.h"
 #include "misc.h"
 
-error_t
+kern_return_t
 netfs_S_dir_lookup (struct protid *dircred,
 		    const_string_t filename,
 		    int flags,
diff --git a/libnetfs/dir-mkdir.c b/libnetfs/dir-mkdir.c
index c9149804..2452eaec 100644
--- a/libnetfs/dir-mkdir.c
+++ b/libnetfs/dir-mkdir.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_mkdir (struct protid *user, const_string_t name, mode_t mode)
 {
   error_t err;
diff --git a/libnetfs/dir-mkfile.c b/libnetfs/dir-mkfile.c
index 6cd79174..90361010 100644
--- a/libnetfs/dir-mkfile.c
+++ b/libnetfs/dir-mkfile.c
@@ -22,7 +22,7 @@
 #include "misc.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_mkfile (struct protid *diruser, int flags, mode_t mode, 
 		    mach_port_t *newfile, mach_msg_type_name_t *newfiletype)
 {
diff --git a/libnetfs/dir-notice-changes.c b/libnetfs/dir-notice-changes.c
index e124e0bd..87721289 100644
--- a/libnetfs/dir-notice-changes.c
+++ b/libnetfs/dir-notice-changes.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_notice_changes (struct protid *dir,
 			    mach_port_t port)
 {
diff --git a/libnetfs/dir-readdir.c b/libnetfs/dir-readdir.c
index 3d40dfa5..c7b71b7c 100644
--- a/libnetfs/dir-readdir.c
+++ b/libnetfs/dir-readdir.c
@@ -23,7 +23,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_readdir (struct protid *user,
 		     data_t *data,
 		     mach_msg_type_number_t *datacnt,
diff --git a/libnetfs/dir-rename.c b/libnetfs/dir-rename.c
index c24488b4..87c297d4 100644
--- a/libnetfs/dir-rename.c
+++ b/libnetfs/dir-rename.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_rename (struct protid *fromdiruser, const_string_t fromname,
 		    struct protid *todiruser, const_string_t toname, int excl)
 {
diff --git a/libnetfs/dir-rmdir.c b/libnetfs/dir-rmdir.c
index 74abb497..544a0a1d 100644
--- a/libnetfs/dir-rmdir.c
+++ b/libnetfs/dir-rmdir.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_rmdir (struct protid *diruser, const_string_t name)
 {
   error_t err;
diff --git a/libnetfs/dir-unlink.c b/libnetfs/dir-unlink.c
index 83cd7638..597a12ca 100644
--- a/libnetfs/dir-unlink.c
+++ b/libnetfs/dir-unlink.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_dir_unlink (struct protid *user, const_string_t name)
 {
   error_t err;
diff --git a/libnetfs/file-chauthor.c b/libnetfs/file-chauthor.c
index 7041b2b8..b403a51d 100644
--- a/libnetfs/file-chauthor.c
+++ b/libnetfs/file-chauthor.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_chauthor (struct protid *user,
 		       uid_t author)
 {
diff --git a/libnetfs/file-check-access.c b/libnetfs/file-check-access.c
index d8773ff2..62234048 100644
--- a/libnetfs/file-check-access.c
+++ b/libnetfs/file-check-access.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_check_access (struct protid *user,
 			   int *types)
 {
diff --git a/libnetfs/file-chflags.c b/libnetfs/file-chflags.c
index a5c132d4..d79b6d87 100644
--- a/libnetfs/file-chflags.c
+++ b/libnetfs/file-chflags.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_chflags (struct protid *user,
 		      int flags)
 {
diff --git a/libnetfs/file-chmod.c b/libnetfs/file-chmod.c
index 413261ca..7e63a8ad 100644
--- a/libnetfs/file-chmod.c
+++ b/libnetfs/file-chmod.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_chmod (struct protid *user,
 		    mode_t mode)
 {
diff --git a/libnetfs/file-chown.c b/libnetfs/file-chown.c
index d02876c7..d1ad9f86 100644
--- a/libnetfs/file-chown.c
+++ b/libnetfs/file-chown.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_chown (struct protid *user,
 		    uid_t owner,
 		    uid_t group)
diff --git a/libnetfs/file-get-fs-options.c b/libnetfs/file-get-fs-options.c
index 7f759cc0..fcb649e4 100644
--- a/libnetfs/file-get-fs-options.c
+++ b/libnetfs/file-get-fs-options.c
@@ -29,7 +29,7 @@
    are pending libnetfs being fleshed out some more.  */
 
 /* Implement file_get_fs_options as described in <hurd/fs.defs>. */
-error_t
+kern_return_t
 netfs_S_file_get_fs_options (struct protid *user,
 			     data_t *data, mach_msg_type_number_t *data_len)
 {
diff --git a/libnetfs/file-get-storage-info.c b/libnetfs/file-get-storage-info.c
index 18e9aa34..d9a3ab82 100644
--- a/libnetfs/file-get-storage-info.c
+++ b/libnetfs/file-get-storage-info.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_get_storage_info (struct protid *user,
 			       mach_port_t **ports,
 			       mach_msg_type_name_t *ports_type,
diff --git a/libnetfs/file-get-transcntl.c b/libnetfs/file-get-transcntl.c
index 04596d72..f74c8415 100644
--- a/libnetfs/file-get-transcntl.c
+++ b/libnetfs/file-get-transcntl.c
@@ -23,7 +23,7 @@
 #include "fs_S.h"
 
 /* Implement file_get_translator_cntl as described in <hurd/fs.defs>. */
-error_t
+kern_return_t
 netfs_S_file_get_translator_cntl (struct protid *cred,
 				  mach_port_t *ctl,
 				  mach_msg_type_name_t *ctltype)
diff --git a/libnetfs/file-get-translator.c b/libnetfs/file-get-translator.c
index 8e8c3eb6..b3998b08 100644
--- a/libnetfs/file-get-translator.c
+++ b/libnetfs/file-get-translator.c
@@ -26,7 +26,7 @@
 #include <sys/mman.h>
 #include <sys/sysmacros.h>
 
-error_t
+kern_return_t
 netfs_S_file_get_translator (struct protid *user,
 			     data_t *trans,
 			     mach_msg_type_number_t *translen)
diff --git a/libnetfs/file-getcontrol.c b/libnetfs/file-getcontrol.c
index 0e29ccf9..6ba989c0 100644
--- a/libnetfs/file-getcontrol.c
+++ b/libnetfs/file-getcontrol.c
@@ -23,7 +23,7 @@
 #include "fs_S.h"
 #include <hurd/fshelp.h>
 
-error_t
+kern_return_t
 netfs_S_file_getcontrol (struct protid *user,
 			 mach_port_t *control,
 			 mach_msg_type_name_t *controltype)
diff --git a/libnetfs/file-getlinknode.c b/libnetfs/file-getlinknode.c
index a15c8d5f..0f20fe85 100644
--- a/libnetfs/file-getlinknode.c
+++ b/libnetfs/file-getlinknode.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_getlinknode (struct protid *user,
 			  file_t *port,
 			  mach_msg_type_name_t *porttype)
diff --git a/libnetfs/file-lock-stat.c b/libnetfs/file-lock-stat.c
index c2145918..dac19d68 100644
--- a/libnetfs/file-lock-stat.c
+++ b/libnetfs/file-lock-stat.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <sys/file.h>
 
-error_t
+kern_return_t
 netfs_S_file_lock_stat (struct protid *user,
 			int *mystatus,
 			int *otherstatus)
diff --git a/libnetfs/file-lock.c b/libnetfs/file-lock.c
index 2aa28458..3667c324 100644
--- a/libnetfs/file-lock.c
+++ b/libnetfs/file-lock.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <sys/file.h>
 
-error_t
+kern_return_t
 netfs_S_file_lock (struct protid *user,
 		   int flags)
 {
diff --git a/libnetfs/file-reparent.c b/libnetfs/file-reparent.c
index 61b7e37f..b04bab3b 100644
--- a/libnetfs/file-reparent.c
+++ b/libnetfs/file-reparent.c
@@ -22,7 +22,7 @@
 
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_reparent (struct protid *cred, mach_port_t parent,
 		       mach_port_t *new_file, mach_msg_type_name_t *new_file_type)
 {
diff --git a/libnetfs/file-set-size.c b/libnetfs/file-set-size.c
index 1700ee18..dd1f606a 100644
--- a/libnetfs/file-set-size.c
+++ b/libnetfs/file-set-size.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_set_size (struct protid *user,
 		       off_t size)
 {
diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c
index 26d9a6e6..f54f3890 100644
--- a/libnetfs/file-set-translator.c
+++ b/libnetfs/file-set-translator.c
@@ -25,7 +25,7 @@
 #include <hurd/paths.h>
 #include <hurd/fsys.h>
 
-error_t
+kern_return_t
 netfs_S_file_set_translator (struct protid *user,
 			     int passive_flags, int active_flags,
 			     int killtrans_flags, const_data_t passive,
diff --git a/libnetfs/file-statfs.c b/libnetfs/file-statfs.c
index 13ae7d94..dff7e90e 100644
--- a/libnetfs/file-statfs.c
+++ b/libnetfs/file-statfs.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_statfs (struct protid *user,
 		     struct statfs *st)
 {
diff --git a/libnetfs/file-sync.c b/libnetfs/file-sync.c
index 4f6b4db8..6befe62e 100644
--- a/libnetfs/file-sync.c
+++ b/libnetfs/file-sync.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_sync (struct protid *user,
 		   int wait,
 		   int omitmeta)
diff --git a/libnetfs/file-syncfs.c b/libnetfs/file-syncfs.c
index 6a388daa..e371973d 100644
--- a/libnetfs/file-syncfs.c
+++ b/libnetfs/file-syncfs.c
@@ -22,7 +22,7 @@
 #include "fs_S.h"
 #include <hurd/fsys.h>
 
-error_t
+kern_return_t
 netfs_S_file_syncfs (struct protid *user,
 		     int wait,
 		     int dochildren)
diff --git a/libnetfs/file-utimes.c b/libnetfs/file-utimes.c
index 042c43e8..1b5c2856 100644
--- a/libnetfs/file-utimes.c
+++ b/libnetfs/file-utimes.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "fs_S.h"
 
-error_t
+kern_return_t
 netfs_S_file_utimes (struct protid *user,
 		     time_value_t atimein,
 		     time_value_t mtimein)
@@ -47,7 +47,7 @@ netfs_S_file_utimes (struct protid *user,
   return netfs_S_file_utimens (user, atim, mtim);
 }
 
-error_t
+kern_return_t
 netfs_S_file_utimens (struct protid *user,
 		     struct timespec atimein,
 		     struct timespec mtimein)
diff --git a/libnetfs/fsstubs.c b/libnetfs/fsstubs.c
index dffdad16..8e795730 100644
--- a/libnetfs/fsstubs.c
+++ b/libnetfs/fsstubs.c
@@ -23,21 +23,21 @@
 #include "fs_S.h"
 #include "ifsock_S.h"
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_file_notice_changes (struct protid *user,
 			     mach_port_t port)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_file_getfh (struct protid *user,
 		    data_t *data, mach_msg_type_number_t *ndata)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_ifsock_getsockaddr (struct protid *user,
 			    mach_port_t *address)
 {
diff --git a/libnetfs/fsys-get-children.c b/libnetfs/fsys-get-children.c
index 1f57efab..3ede9332 100644
--- a/libnetfs/fsys-get-children.c
+++ b/libnetfs/fsys-get-children.c
@@ -30,7 +30,7 @@
    or more links in the file system, therefore there is no guarantee
    that a translators name refers to an existing link in the file
    system.  */
-error_t
+kern_return_t
 netfs_S_fsys_get_children (struct netfs_control *fsys,
 			   mach_port_t reply,
 			   mach_msg_type_name_t reply_type,
diff --git a/libnetfs/fsys-get-options.c b/libnetfs/fsys-get-options.c
index ee333813..6710cf26 100644
--- a/libnetfs/fsys-get-options.c
+++ b/libnetfs/fsys-get-options.c
@@ -30,7 +30,7 @@
    are pending libnetfs being fleshed out some more.  */
 
 /* Implement fsys_get_options as described in <hurd/fsys.defs>. */
-error_t
+kern_return_t
 netfs_S_fsys_get_options (struct netfs_control *port,
 			  mach_port_t reply,
 			  mach_msg_type_name_t reply_type,
diff --git a/libnetfs/fsys-get-source.c b/libnetfs/fsys-get-source.c
index 65431d4b..e991a354 100644
--- a/libnetfs/fsys-get-source.c
+++ b/libnetfs/fsys-get-source.c
@@ -26,7 +26,7 @@
    appropriate in the context of the translator.  For example, if the
    translator is a filesystem residing on a block device, then SOURCE
    should be the file name of the underlying block device.  */
-error_t
+kern_return_t
 netfs_S_fsys_get_source (struct netfs_control *fsys,
                          mach_port_t reply,
                          mach_msg_type_name_t reply_type,
diff --git a/libnetfs/fsys-getroot.c b/libnetfs/fsys-getroot.c
index 47fb1c74..a29caaa5 100644
--- a/libnetfs/fsys-getroot.c
+++ b/libnetfs/fsys-getroot.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <hurd/fshelp.h>
 
-error_t
+kern_return_t
 netfs_S_fsys_getroot (struct netfs_control *pt,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
diff --git a/libnetfs/fsys-goaway.c b/libnetfs/fsys-goaway.c
index 872d0730..fc2df863 100644
--- a/libnetfs/fsys-goaway.c
+++ b/libnetfs/fsys-goaway.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <hurd/ports.h>
 
-error_t
+kern_return_t
 netfs_S_fsys_goaway (struct netfs_control *pt,
 		     mach_port_t reply,
 		     mach_msg_type_name_t reply_type,
diff --git a/libnetfs/fsys-set-options.c b/libnetfs/fsys-set-options.c
index 2b7e07e0..91cc2cdc 100644
--- a/libnetfs/fsys-set-options.c
+++ b/libnetfs/fsys-set-options.c
@@ -46,7 +46,7 @@ helper (void *cookie, const char *name, mach_port_t control)
 }
 
 /* Implement fsys_set_options as described in <hurd/fsys.defs>. */
-error_t
+kern_return_t
 netfs_S_fsys_set_options (struct netfs_control *pt,
 			  mach_port_t reply,
 			  mach_msg_type_name_t reply_type,
diff --git a/libnetfs/fsys-syncfs.c b/libnetfs/fsys-syncfs.c
index 904e9246..07a69ea9 100644
--- a/libnetfs/fsys-syncfs.c
+++ b/libnetfs/fsys-syncfs.c
@@ -36,7 +36,7 @@ helper (void *cookie, const char *name, mach_port_t control)
   return 0;
 }
 
-error_t
+kern_return_t
 netfs_S_fsys_syncfs (struct netfs_control *cntl,
 		     mach_port_t reply,
 		     mach_msg_type_name_t reply_type,
diff --git a/libnetfs/fsysstubs.c b/libnetfs/fsysstubs.c
index 4fbd4756..8dd01f0a 100644
--- a/libnetfs/fsysstubs.c
+++ b/libnetfs/fsysstubs.c
@@ -22,7 +22,7 @@
 #include "netfs.h"
 #include "fsys_S.h"
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_fsys_getfile (struct netfs_control *cntl,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
@@ -34,7 +34,7 @@ netfs_S_fsys_getfile (struct netfs_control *cntl,
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_fsys_getpriv (struct netfs_control *cntl,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
@@ -45,7 +45,7 @@ netfs_S_fsys_getpriv (struct netfs_control *cntl,
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_fsys_init (struct netfs_control *cntl,
 		   mach_port_t reply,
 		   mach_msg_type_name_t reply_type,
@@ -54,7 +54,7 @@ netfs_S_fsys_init (struct netfs_control *cntl,
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_fsys_forward (mach_port_t cntl,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
@@ -64,7 +64,7 @@ netfs_S_fsys_forward (mach_port_t cntl,
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_fsys_startup (mach_port_t bootstrap,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
diff --git a/libnetfs/io-async.c b/libnetfs/io-async.c
index 10504adb..2ed68d87 100644
--- a/libnetfs/io-async.c
+++ b/libnetfs/io-async.c
@@ -22,7 +22,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_async (struct protid *user, mach_port_t notify, mach_port_t *id,
 		  mach_msg_type_name_t *idt)
 {
diff --git a/libnetfs/io-clear-some-openmodes.c b/libnetfs/io-clear-some-openmodes.c
index 1da5e476..ea6c770f 100644
--- a/libnetfs/io-clear-some-openmodes.c
+++ b/libnetfs/io-clear-some-openmodes.c
@@ -22,7 +22,7 @@
 #include "io_S.h"
 #include "modes.h"
 
-error_t
+kern_return_t
 netfs_S_io_clear_some_openmodes (struct protid *user, int bits)
 {
   if (!user)
diff --git a/libnetfs/io-duplicate.c b/libnetfs/io-duplicate.c
index 263f9e81..e6ac7a11 100644
--- a/libnetfs/io-duplicate.c
+++ b/libnetfs/io-duplicate.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_duplicate (struct protid *user,
 		      mach_port_t *newport,
 		      mach_msg_type_name_t *newporttp)
diff --git a/libnetfs/io-get-icky-async-id.c b/libnetfs/io-get-icky-async-id.c
index 23dac534..81e0063f 100644
--- a/libnetfs/io-get-icky-async-id.c
+++ b/libnetfs/io-get-icky-async-id.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_get_icky_async_id (struct protid *user, mach_port_t *pt,
 			      mach_msg_type_name_t *ptt)
 {
diff --git a/libnetfs/io-get-openmodes.c b/libnetfs/io-get-openmodes.c
index 698c2937..c9544117 100644
--- a/libnetfs/io-get-openmodes.c
+++ b/libnetfs/io-get-openmodes.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_get_openmodes (struct protid *user, int *bits)
 {
   if (!user)
diff --git a/libnetfs/io-get-owner.c b/libnetfs/io-get-owner.c
index 9bbf41de..5e501bdb 100644
--- a/libnetfs/io-get-owner.c
+++ b/libnetfs/io-get-owner.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_get_owner (struct protid *user, pid_t *owner)
 {
   if (!user)
diff --git a/libnetfs/io-identity.c b/libnetfs/io-identity.c
index 0c6a191c..5cea19c7 100644
--- a/libnetfs/io-identity.c
+++ b/libnetfs/io-identity.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_identity (struct protid *cred,
 		     mach_port_t *id,
 		     mach_msg_type_name_t *idtype,
diff --git a/libnetfs/io-mod-owner.c b/libnetfs/io-mod-owner.c
index 91cbdb03..d8ca45c6 100644
--- a/libnetfs/io-mod-owner.c
+++ b/libnetfs/io-mod-owner.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_mod_owner (struct protid *user, pid_t owner)
 {
   if (!user)
diff --git a/libnetfs/io-pathconf.c b/libnetfs/io-pathconf.c
index 0791243e..38b4557f 100644
--- a/libnetfs/io-pathconf.c
+++ b/libnetfs/io-pathconf.c
@@ -23,7 +23,7 @@
 #include "io_S.h"
 
 
-error_t
+kern_return_t
 netfs_S_io_pathconf (struct protid *user,
 		     int name,
 		     int *value)
diff --git a/libnetfs/io-read.c b/libnetfs/io-read.c
index 2ee49c5d..96b003b3 100644
--- a/libnetfs/io-read.c
+++ b/libnetfs/io-read.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-error_t
+kern_return_t
 netfs_S_io_read (struct protid *user,
 		 data_t *data,
 		 mach_msg_type_number_t *datalen,
diff --git a/libnetfs/io-readable.c b/libnetfs/io-readable.c
index 7c365484..6c98c50e 100644
--- a/libnetfs/io-readable.c
+++ b/libnetfs/io-readable.c
@@ -23,7 +23,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_readable (struct protid *user,
 		     vm_size_t *amount)
 {
diff --git a/libnetfs/io-reauthenticate.c b/libnetfs/io-reauthenticate.c
index 4351545b..763a441f 100644
--- a/libnetfs/io-reauthenticate.c
+++ b/libnetfs/io-reauthenticate.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_reauthenticate (struct protid *user, mach_port_t rend_port)
 {
   error_t err;
diff --git a/libnetfs/io-restrict-auth.c b/libnetfs/io-restrict-auth.c
index 4ee77356..7748b3ef 100644
--- a/libnetfs/io-restrict-auth.c
+++ b/libnetfs/io-restrict-auth.c
@@ -21,7 +21,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_restrict_auth (struct protid *user,
 			  mach_port_t *newport,
 			  mach_msg_type_name_t *newporttype,
diff --git a/libnetfs/io-seek.c b/libnetfs/io-seek.c
index 1dc7d322..49236fa5 100644
--- a/libnetfs/io-seek.c
+++ b/libnetfs/io-seek.c
@@ -22,7 +22,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t
+kern_return_t
 netfs_S_io_seek (struct protid *user,
 		 off_t offset,
 		 int whence,
diff --git a/libnetfs/io-select.c b/libnetfs/io-select.c
index 63036145..cc7fdb2a 100644
--- a/libnetfs/io-select.c
+++ b/libnetfs/io-select.c
@@ -22,7 +22,7 @@
 #include "io_S.h"
 #include <hurd/ports.h>
 
-error_t
+kern_return_t
 netfs_S_io_select (struct protid *user,
 		   mach_port_t reply,
 		   mach_msg_type_name_t replytype,
@@ -35,7 +35,7 @@ netfs_S_io_select (struct protid *user,
   return 0;
 }
 
-error_t
+kern_return_t
 netfs_S_io_select_timeout (struct protid *user,
 			   mach_port_t reply,
 			   mach_msg_type_name_t replytype,
diff --git a/libnetfs/io-set-all-openmodes.c b/libnetfs/io-set-all-openmodes.c
index 2424282e..8f5a534a 100644
--- a/libnetfs/io-set-all-openmodes.c
+++ b/libnetfs/io-set-all-openmodes.c
@@ -22,7 +22,7 @@
 #include "io_S.h"
 #include "modes.h"
 
-error_t
+kern_return_t
 netfs_S_io_set_all_openmodes (struct protid *user, int newbits)
 {
   if (!user)
diff --git a/libnetfs/io-set-some-openmodes.c b/libnetfs/io-set-some-openmodes.c
index 48fbeed6..d0f0d502 100644
--- a/libnetfs/io-set-some-openmodes.c
+++ b/libnetfs/io-set-some-openmodes.c
@@ -22,7 +22,7 @@
 #include "io_S.h"
 #include "modes.h"
 
-error_t
+kern_return_t
 netfs_S_io_set_some_openmodes (struct protid *user, int bits)
 {
   if (!user)
diff --git a/libnetfs/io-stat.c b/libnetfs/io-stat.c
index 81e42bdb..79ec3dc6 100644
--- a/libnetfs/io-stat.c
+++ b/libnetfs/io-stat.c
@@ -22,7 +22,7 @@
 #include "io_S.h"
 #include <string.h>
 
-error_t
+kern_return_t
 netfs_S_io_stat (struct protid *user, io_statbuf_t *statbuf)
 {
   error_t err;
diff --git a/libnetfs/io-write.c b/libnetfs/io-write.c
index 2306d1f0..132b255e 100644
--- a/libnetfs/io-write.c
+++ b/libnetfs/io-write.c
@@ -22,7 +22,7 @@
 #include "io_S.h"
 #include <fcntl.h>
 
-error_t
+kern_return_t
 netfs_S_io_write (struct protid *user,
 		  const_data_t data,
 		  mach_msg_type_number_t datalen,
diff --git a/libnetfs/iostubs.c b/libnetfs/iostubs.c
index df48f8b7..09d80774 100644
--- a/libnetfs/iostubs.c
+++ b/libnetfs/iostubs.c
@@ -22,7 +22,7 @@
 #include "netfs.h"
 #include "io_S.h"
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_map (struct protid *user,
 		mach_port_t *rdobj, mach_msg_type_name_t *rdobjtype,
 		mach_port_t *wrobj, mach_msg_type_name_t *wrobjtype)
@@ -70,7 +70,7 @@ error:
   return errno;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_map_cntl (struct protid *user,
 		     mach_port_t *obj,
 		     mach_msg_type_name_t *objtype)
@@ -78,51 +78,51 @@ netfs_S_io_map_cntl (struct protid *user,
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_get_conch (struct protid *user)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_release_conch (struct protid *user)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_eofnotify (struct protid *user)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_prenotify (struct protid *user,
 		      vm_offset_t start, vm_offset_t stop)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_postnotify (struct protid *user,
 		       vm_offset_t start, vm_offset_t stop)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_readnotify (struct protid *user)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_readsleep (struct protid *user)
 {
   return EOPNOTSUPP;
 }
 
-error_t __attribute__((weak))
+kern_return_t __attribute__((weak))
 netfs_S_io_sigio (struct protid *user)
 {
   return EOPNOTSUPP;
diff --git a/libports/notify-dead-name.c b/libports/notify-dead-name.c
index 8d79a631..e48edd9b 100644
--- a/libports/notify-dead-name.c
+++ b/libports/notify-dead-name.c
@@ -21,7 +21,7 @@
 #include "ports.h"
 #include "notify_S.h"
 
-error_t
+kern_return_t
 ports_do_mach_notify_dead_name (struct port_info *pi,
 				mach_port_t dead_name)
 {
diff --git a/libports/notify-msg-accepted.c b/libports/notify-msg-accepted.c
index 769d00f1..dbdde09e 100644
--- a/libports/notify-msg-accepted.c
+++ b/libports/notify-msg-accepted.c
@@ -21,7 +21,7 @@
 #include "ports.h"
 #include "notify_S.h"
 
-error_t
+kern_return_t
 ports_do_mach_notify_msg_accepted (struct port_info *pi,
 				   mach_port_t name)
 {
diff --git a/libports/notify-no-senders.c b/libports/notify-no-senders.c
index cf0b386a..0d64c544 100644
--- a/libports/notify-no-senders.c
+++ b/libports/notify-no-senders.c
@@ -22,7 +22,7 @@
 #include "ports.h"
 #include "notify_S.h"
 
-error_t
+kern_return_t
 ports_do_mach_notify_no_senders (struct port_info *pi,
                                  mach_port_mscount_t count)
 {
diff --git a/libports/notify-port-deleted.c b/libports/notify-port-deleted.c
index 33ecc251..f17f143d 100644
--- a/libports/notify-port-deleted.c
+++ b/libports/notify-port-deleted.c
@@ -21,7 +21,7 @@
 #include "ports.h"
 #include "notify_S.h"
 
-error_t
+kern_return_t
 ports_do_mach_notify_port_deleted (struct port_info *pi,
 				   mach_port_t name)
 {
diff --git a/libports/notify-port-destroyed.c b/libports/notify-port-destroyed.c
index b49aad24..5260922c 100644
--- a/libports/notify-port-destroyed.c
+++ b/libports/notify-port-destroyed.c
@@ -21,7 +21,7 @@
 #include "ports.h"
 #include "notify_S.h"
 
-error_t
+kern_return_t
 ports_do_mach_notify_port_destroyed (struct port_info *pi,
 				     mach_port_t name)
 {
diff --git a/libports/notify-send-once.c b/libports/notify-send-once.c
index a680802a..132b7c26 100644
--- a/libports/notify-send-once.c
+++ b/libports/notify-send-once.c
@@ -21,7 +21,7 @@
 #include "ports.h"
 #include "notify_S.h"
 
-error_t
+kern_return_t
 ports_do_mach_notify_send_once (struct port_info *pi)
 {
   return EOPNOTSUPP;
diff --git a/libtrivfs/file-access.c b/libtrivfs/file-access.c
index f289a23b..4a65b7a7 100644
--- a/libtrivfs/file-access.c
+++ b/libtrivfs/file-access.c
@@ -18,7 +18,7 @@
 #include "priv.h"
 #include "trivfs_fs_S.h"
 
-error_t
+kern_return_t
 trivfs_S_file_check_access (struct trivfs_protid *cred,
 			    mach_port_t reply, mach_msg_type_name_t reply_type,
 			    int *allowed)
diff --git a/libtrivfs/file-get-fs-options.c b/libtrivfs/file-get-fs-options.c
index e3e033e6..e344eaea 100644
--- a/libtrivfs/file-get-fs-options.c
+++ b/libtrivfs/file-get-fs-options.c
@@ -24,7 +24,7 @@
 #include "priv.h"
 #include "trivfs_fs_S.h"
 
-error_t
+kern_return_t
 trivfs_S_file_get_fs_options (struct trivfs_protid *cred,
 			      mach_port_t reply,
 			      mach_msg_type_name_t reply_type,
diff --git a/libtrivfs/file-get-storage-info.c b/libtrivfs/file-get-storage-info.c
index a4a44bb2..6e96638a 100644
--- a/libtrivfs/file-get-storage-info.c
+++ b/libtrivfs/file-get-storage-info.c
@@ -18,7 +18,7 @@
 #include "priv.h"
 #include "trivfs_fs_S.h"
 
-error_t
+kern_return_t
 trivfs_S_file_get_storage_info (struct trivfs_protid *cred,
 				mach_port_t reply,
 				mach_msg_type_name_t reply_type,
diff --git a/libtrivfs/file-reparent.c b/libtrivfs/file-reparent.c
index 5892013c..e52a8bb9 100644
--- a/libtrivfs/file-reparent.c
+++ b/libtrivfs/file-reparent.c
@@ -22,7 +22,7 @@
 #include "trivfs_fs_S.h"
 #include "trivfs_io_S.h"
 
-error_t
+kern_return_t
 trivfs_S_file_reparent (struct trivfs_protid *cred,
 			mach_port_t reply, mach_msg_type_name_t reply_type,
 			mach_port_t parent,
diff --git a/libtrivfs/fsys-forward.c b/libtrivfs/fsys-forward.c
index a3be1849..f7b23674 100644
--- a/libtrivfs/fsys-forward.c
+++ b/libtrivfs/fsys-forward.c
@@ -28,7 +28,7 @@
    the command line arguments.  If the recipient accepts the request, he
    (or some delegate) should send fsys_startup to REQUESTOR to start the
    filesystem up.  */
-error_t
+kern_return_t
 trivfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
diff --git a/libtrivfs/fsys-get-children.c b/libtrivfs/fsys-get-children.c
index f0cd28c2..5e1d6c7a 100644
--- a/libtrivfs/fsys-get-children.c
+++ b/libtrivfs/fsys-get-children.c
@@ -27,7 +27,7 @@
    or more links in the file system, therefore there is no guarantee
    that a translators name refers to an existing link in the file
    system.  */
-error_t
+kern_return_t
 trivfs_S_fsys_get_children (struct trivfs_control *fsys,
 			    mach_port_t reply,
 			    mach_msg_type_name_t replyPoly,
diff --git a/libtrivfs/fsys-get-options.c b/libtrivfs/fsys-get-options.c
index 37247035..3e3774b1 100644
--- a/libtrivfs/fsys-get-options.c
+++ b/libtrivfs/fsys-get-options.c
@@ -24,7 +24,7 @@
 #include "priv.h"
 #include "trivfs_fsys_S.h"
 
-error_t
+kern_return_t
 trivfs_S_fsys_get_options (struct trivfs_control *fsys,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
 			   data_t *data, mach_msg_type_number_t *len)
diff --git a/libtrivfs/fsys-get-source.c b/libtrivfs/fsys-get-source.c
index 37ae57d7..7e95a2b5 100644
--- a/libtrivfs/fsys-get-source.c
+++ b/libtrivfs/fsys-get-source.c
@@ -26,7 +26,7 @@
    appropriate in the context of the translator.  For example, if the
    translator is a filesystem residing on a block device, then SOURCE
    should be the file name of the underlying block device.  */
-error_t
+kern_return_t
 trivfs_S_fsys_get_source (struct trivfs_control *fsys,
 			  mach_port_t reply,
 			  mach_msg_type_name_t replyPoly,
diff --git a/libtrivfs/fsys-set-options.c b/libtrivfs/fsys-set-options.c
index ca5a9458..cb2015ce 100644
--- a/libtrivfs/fsys-set-options.c
+++ b/libtrivfs/fsys-set-options.c
@@ -23,7 +23,7 @@
 #include "priv.h"
 #include "trivfs_fsys_S.h"
 
-error_t
+kern_return_t
 trivfs_S_fsys_set_options (struct trivfs_control *cntl,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
 			   const_data_t data, mach_msg_type_number_t len,
diff --git a/libtrivfs/io-identity.c b/libtrivfs/io-identity.c
index a67ed7ec..05888631 100644
--- a/libtrivfs/io-identity.c
+++ b/libtrivfs/io-identity.c
@@ -21,7 +21,7 @@
 #include "priv.h"
 #include "trivfs_io_S.h"
 
-error_t
+kern_return_t
 trivfs_S_io_identity (struct trivfs_protid *cred,
 		      mach_port_t reply,
 		      mach_msg_type_name_t replytype,
diff --git a/libtrivfs/io-modes-set.c b/libtrivfs/io-modes-set.c
index 44846428..fd4ddee6 100644
--- a/libtrivfs/io-modes-set.c
+++ b/libtrivfs/io-modes-set.c
@@ -23,7 +23,7 @@
 #include "trivfs_io_S.h"
 #include <assert-backtrace.h>
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
 			       mach_port_t reply,
 			       mach_msg_type_name_t replytype,
diff --git a/pflocal/fs.c b/pflocal/fs.c
index 10ed9156..17f5ab4d 100644
--- a/pflocal/fs.c
+++ b/pflocal/fs.c
@@ -25,7 +25,7 @@
 
 #include "fs_S.h"
 
-error_t
+kern_return_t
 S_file_check_access (struct sock_user *cred, int *type)
 {
   if (!cred)
diff --git a/pflocal/io.c b/pflocal/io.c
index f621bbb3..6d43b6dd 100644
--- a/pflocal/io.c
+++ b/pflocal/io.c
@@ -41,7 +41,7 @@
 /* Read data from an IO object.  If offset if -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in amount.  */
-error_t
+kern_return_t
 S_io_read (struct sock_user *user,
 	   data_t *data, mach_msg_type_number_t *data_len,
 	   off_t offset, vm_size_t amount)
@@ -79,7 +79,7 @@ S_io_read (struct sock_user *user,
    object at a time; servers implement congestion control by delaying
    responses to io_write.  Servers may drop data (returning ENOBUFS)
    if they recevie more than one write when not prepared for it.  */
-error_t
+kern_return_t
 S_io_write (struct sock_user *user,
 	    const_data_t data, mach_msg_type_number_t data_len,
 	    off_t offset, vm_size_t *amount)
@@ -120,7 +120,7 @@ S_io_write (struct sock_user *user,
 /* Tell how much data can be read from the object without blocking for
    a "long time" (this should be the same meaning of "long time" used
    by the nonblocking flag.  */
-error_t
+kern_return_t
 S_io_readable (struct sock_user *user, vm_size_t *amount)
 {
   error_t err;
@@ -146,7 +146,7 @@ S_io_readable (struct sock_user *user, vm_size_t *amount)
 }
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 S_io_seek (struct sock_user *user,
 	   off_t offset, int whence, off_t *new_offset)
 {
@@ -154,7 +154,7 @@ S_io_seek (struct sock_user *user,
 }
 
 /* Return a new port with the same semantics as the existing port. */
-error_t
+kern_return_t
 S_io_duplicate (struct sock_user *user,
 		mach_port_t *new_port, mach_msg_type_name_t *new_port_type)
 {
@@ -282,7 +282,7 @@ io_select_common (struct sock_user *user,
   return err;
 }
 
-error_t
+kern_return_t
 S_io_select (struct sock_user *user,
 	     mach_port_t reply, mach_msg_type_name_t reply_type,
 	     int *select_type)
@@ -290,7 +290,7 @@ S_io_select (struct sock_user *user,
   return io_select_common (user, reply, reply_type, NULL, select_type);
 }
 
-error_t
+kern_return_t
 S_io_select_timeout (struct sock_user *user,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
 		     struct timespec ts,
@@ -310,7 +310,7 @@ copy_time (time_value_t *from, time_t *to_sec, long *to_nsec)
    io_statuf_t are meaningful for all objects; however, the access and
    modify times, the optimal IO size, and the fs type are meaningful
    for all objects.  */
-error_t
+kern_return_t
 S_io_stat (struct sock_user *user, struct stat *st)
 {
   struct sock *sock;
@@ -365,7 +365,7 @@ S_io_stat (struct sock_user *user, struct stat *st)
   return 0;
 }
 
-error_t
+kern_return_t
 S_io_get_openmodes (struct sock_user *user, int *bits)
 {
   unsigned flags;
@@ -380,7 +380,7 @@ S_io_get_openmodes (struct sock_user *user, int *bits)
   return 0;
 }
 
-error_t
+kern_return_t
 S_io_set_all_openmodes (struct sock_user *user, int bits)
 {
   if (!user)
@@ -396,7 +396,7 @@ S_io_set_all_openmodes (struct sock_user *user, int bits)
   return 0;
 }
 
-error_t
+kern_return_t
 S_io_set_some_openmodes (struct sock_user *user, int bits)
 {
   if (!user)
@@ -410,7 +410,7 @@ S_io_set_some_openmodes (struct sock_user *user, int bits)
   return 0;
 }
 
-error_t
+kern_return_t
 S_io_clear_some_openmodes (struct sock_user *user, int bits)
 {
   if (!user)
@@ -426,7 +426,7 @@ S_io_clear_some_openmodes (struct sock_user *user, int bits)
 
 #define NIDS 10
 
-error_t
+kern_return_t
 S_io_reauthenticate (struct sock_user *user, mach_port_t rendezvous)
 {
   error_t err;
@@ -477,7 +477,7 @@ S_io_reauthenticate (struct sock_user *user, mach_port_t rendezvous)
   return err;
 }
 
-error_t
+kern_return_t
 S_io_restrict_auth (struct sock_user *user,
 		    mach_port_t *new_port,
 		    mach_msg_type_name_t *new_port_type,
@@ -490,7 +490,7 @@ S_io_restrict_auth (struct sock_user *user,
   return sock_create_port (user->sock, new_port);
 }
 
-error_t
+kern_return_t
 S_io_pathconf (struct sock_user *user, int name, int *value)
 {
   if (user == NULL)
@@ -509,7 +509,7 @@ S_io_pathconf (struct sock_user *user, int name, int *value)
     return EINVAL;
 }
 
-error_t
+kern_return_t
 S_io_identity (struct sock_user *user,
 	       mach_port_t *id, mach_msg_type_name_t *id_type,
 	       mach_port_t *fsys_id, mach_msg_type_name_t *fsys_id_type,
diff --git a/pflocal/pf.c b/pflocal/pf.c
index 482f3b93..457ebfbd 100644
--- a/pflocal/pf.c
+++ b/pflocal/pf.c
@@ -29,7 +29,7 @@
 
 /* Create a new socket.  Sock type is, for example, SOCK_STREAM,
    SOCK_DGRAM, or some such.  */
-error_t
+kern_return_t
 S_socket_create (trivfs_protid_t pf,
 		 int sock_type, int protocol,
 		 mach_port_t *port, mach_msg_type_name_t *port_type)
@@ -90,7 +90,7 @@ S_socket_create (trivfs_protid_t pf,
   return err;
 }
 
-error_t
+kern_return_t
 S_socket_create_address (mach_port_t pf, int sockaddr_type,
 			 const_data_t data,
 			 mach_msg_type_number_t data_len,
@@ -100,7 +100,7 @@ S_socket_create_address (mach_port_t pf, int sockaddr_type,
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 S_socket_fabricate_address (mach_port_t pf,
 			    int sockaddr_type,
 			    mach_port_t *addr_port,
@@ -128,7 +128,7 @@ S_socket_fabricate_address (mach_port_t pf,
    the file name.  This is primarily for the implementation of accept
    and recvfrom.  The functions getsockname and getpeername remain
    unsupported for the local namespace.  */
-error_t
+kern_return_t
 S_socket_whatis_address (struct addr *addr,
 			 int *sockaddr_type,
 			 data_t *sockaddr,
diff --git a/pflocal/socket.c b/pflocal/socket.c
index 0e0f8d78..ef54b65b 100644
--- a/pflocal/socket.c
+++ b/pflocal/socket.c
@@ -28,7 +28,7 @@
 #include "socket_S.h"
 
 /* Connect two sockets */
-error_t
+kern_return_t
 S_socket_connect2 (struct sock_user *user1, struct sock_user *user2)
 {
   error_t err;
@@ -61,7 +61,7 @@ ensure_connq (struct sock *sock)
 }
 
 /* Prepare a socket of appropriate type for future accept operations.  */
-error_t
+kern_return_t
 S_socket_listen (struct sock_user *user, int queue_limit)
 {
   error_t err;
@@ -75,7 +75,7 @@ S_socket_listen (struct sock_user *user, int queue_limit)
   return err;
 }
 
-error_t
+kern_return_t
 S_socket_connect (struct sock_user *user, struct addr *addr)
 {
   error_t err;
@@ -171,7 +171,7 @@ S_socket_connect (struct sock_user *user, struct addr *addr)
 }
 
 /* Return a new connection from a socket previously listened.  */
-error_t
+kern_return_t
 S_socket_accept (struct sock_user *user,
 		 mach_port_t *port, mach_msg_type_name_t *port_type,
 		 mach_port_t *peer_addr_port,
@@ -222,7 +222,7 @@ S_socket_accept (struct sock_user *user,
 }
 
 /* Bind a socket to an address.  */
-error_t
+kern_return_t
 S_socket_bind (struct sock_user *user, struct addr *addr)
 {
   if (! addr)
@@ -239,7 +239,7 @@ S_socket_bind (struct sock_user *user, struct addr *addr)
 }
 
 /* Shutdown a socket for reading or writing.  */
-error_t
+kern_return_t
 S_socket_shutdown (struct sock_user *user, int what)
 {
   if (! user)
@@ -251,7 +251,7 @@ S_socket_shutdown (struct sock_user *user, int what)
 }
 
 /* Find out the name of a socket.  */
-error_t
+kern_return_t
 S_socket_name (struct sock_user *user,
 	       mach_port_t *addr_port, mach_msg_type_name_t *addr_port_type)
 {
@@ -273,7 +273,7 @@ S_socket_name (struct sock_user *user,
 }
 
 /* Find out the name of the socket's peer.  */
-error_t
+kern_return_t
 S_socket_peername (struct sock_user *user,
 		   mach_port_t *addr_port,
 		   mach_msg_type_name_t *addr_port_type)
@@ -285,7 +285,7 @@ S_socket_peername (struct sock_user *user,
 }
 
 /* Send data over a socket, possibly including Mach ports.  */
-error_t
+kern_return_t
 S_socket_send (struct sock_user *user, struct addr *dest_addr, int flags,
 	       const_data_t data, mach_msg_type_number_t data_len,
 	       const mach_port_t *ports, mach_msg_type_number_t num_ports,
@@ -374,7 +374,7 @@ S_socket_send (struct sock_user *user, struct addr *dest_addr, int flags,
 }
 
 /* Receive data from a socket, possibly including Mach ports.  */
-error_t
+kern_return_t
 S_socket_recv (struct sock_user *user,
 	       mach_port_t *addr, mach_msg_type_name_t *addr_type,
 	       int in_flags,
@@ -448,7 +448,7 @@ S_socket_recv (struct sock_user *user,
   return err;
 }
 
-error_t
+kern_return_t
 S_socket_getopt (struct sock_user *user,
 		 int level, int opt,
 		 data_t *value,
@@ -539,7 +539,7 @@ S_socket_getopt (struct sock_user *user,
   return ret;
 }
 
-error_t
+kern_return_t
 S_socket_setopt (struct sock_user *user,
 		 int level, int opt, const_data_t value,
 		 mach_msg_type_name_t value_len)
diff --git a/proc/mgt.c b/proc/mgt.c
index f87daeb3..76cebaa9 100644
--- a/proc/mgt.c
+++ b/proc/mgt.c
@@ -1256,7 +1256,7 @@ genpid (void)
    us, communicating the names using command line options.  */
 
 /* Implement proc_set_init_task as described in <hurd/process.defs>.  */
-error_t
+kern_return_t
 S_proc_set_init_task(struct proc *callerp,
 		     task_t task)
 {
@@ -1311,7 +1311,7 @@ S_proc_mark_important (struct proc *p)
 }
 
 /* Implement proc_is_important as described in <hurd/process.defs>.  */
-error_t
+kern_return_t
 S_proc_is_important (struct proc *callerp,
 		     boolean_t *essential)
 {
@@ -1324,7 +1324,7 @@ S_proc_is_important (struct proc *callerp,
 }
 
 /* Implement proc_set_code as described in <hurd/process.defs>.  */
-error_t
+kern_return_t
 S_proc_set_code (struct proc *callerp,
 		 vm_address_t start_code,
 		 vm_address_t end_code)
@@ -1339,7 +1339,7 @@ S_proc_set_code (struct proc *callerp,
 }
 
 /* Implement proc_get_code as described in <hurd/process.defs>.  */
-error_t
+kern_return_t
 S_proc_get_code (struct proc *callerp,
 		 vm_address_t *start_code,
 		 vm_address_t *end_code)
@@ -1354,7 +1354,7 @@ S_proc_get_code (struct proc *callerp,
 }
 
 /* Handle new task notifications from the kernel.  */
-error_t
+kern_return_t
 S_mach_notify_new_task (struct port_info *notify,
 			mach_port_t task,
 			mach_port_t parent)
@@ -1400,7 +1400,7 @@ S_mach_notify_new_task (struct port_info *notify,
 
 /* Implement proc_make_task_namespace as described in
    <hurd/process.defs>.  */
-error_t
+kern_return_t
 S_proc_make_task_namespace (struct proc *callerp,
 			    mach_port_t notify)
 {
diff --git a/startup/startup.c b/startup/startup.c
index feb7d265..862572c2 100644
--- a/startup/startup.c
+++ b/startup/startup.c
@@ -1852,7 +1852,7 @@ S_msg_set_env_variable (mach_port_t process,
 	boolean_t replace)
 { return _S_msg_set_env_variable (process, refport, variable, value, replace); }
 
-error_t
+kern_return_t
 S_msg_describe_ports (mach_port_t process,
 		      mach_port_t refport,
 		      const_mach_port_array_t names,
@@ -1864,7 +1864,7 @@ S_msg_describe_ports (mach_port_t process,
 				descriptions, descriptionsCnt);
 }
 
-error_t
+kern_return_t
 S_msg_report_wait (mach_port_t process, thread_t thread,
 		   string_t desc, mach_msg_id_t *rpc)
 {
@@ -1874,7 +1874,7 @@ S_msg_report_wait (mach_port_t process, thread_t thread,
 }
 
 /* fsys */
-error_t
+kern_return_t
 S_fsys_getroot (mach_port_t fsys_t,
 		mach_port_t dotdotnode,
 		const id_t *uids,
@@ -1907,7 +1907,7 @@ S_fsys_getroot (mach_port_t fsys_t,
   return 0;
 }
 
-error_t
+kern_return_t
 S_fsys_get_options (mach_port_t control,
 		    data_t *data, mach_msg_type_number_t *len)
 {
@@ -1915,7 +1915,7 @@ S_fsys_get_options (mach_port_t control,
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 S_file_check_access (mach_port_t server,
                      int *allowed)
 {
@@ -1925,7 +1925,7 @@ S_file_check_access (mach_port_t server,
   return 0;
 }
 
-error_t
+kern_return_t
 S_io_stat (mach_port_t server,
            struct stat *st)
 {
@@ -1941,7 +1941,7 @@ S_io_stat (mach_port_t server,
   return 0;
 }
 
-error_t
+kern_return_t
 S_io_restrict_auth (mach_port_t server,
                     mach_port_t *newport,
                     mach_msg_type_name_t *newporttype,
diff --git a/storeio/io.c b/storeio/io.c
index f01e1918..dca997ef 100644
--- a/storeio/io.c
+++ b/storeio/io.c
@@ -34,7 +34,7 @@
    implement io_map but not io_map_cntl.  Some objects do not provide
    mapping; they will set none of the ports and return an error.  Such
    objects can still be accessed by io_read and io_write.  */
-error_t
+kern_return_t
 trivfs_S_io_map (struct trivfs_protid *cred,
 		 mach_port_t reply, mach_msg_type_name_t reply_type,
 		 memory_object_t *rd_obj, mach_msg_type_name_t *rd_type,
@@ -80,7 +80,7 @@ trivfs_S_io_map (struct trivfs_protid *cred,
 /* Read data from an IO object.  If offset if -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMOUNT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_name_t *data_len,
@@ -105,7 +105,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 /* Tell how much data can be read from the object without blocking for
    a "long time" (this should be the same meaning of "long time" used
    by the nonblocking flag.  */
-error_t
+kern_return_t
 trivfs_S_io_readable (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
 		      vm_size_t *amount)
@@ -129,7 +129,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
    object at a time; servers implement congestion control by delaying
    responses to io_write.  Servers may drop data (returning ENOBUFS)
    if they recevie more than one write when not prepared for it.  */
-error_t
+kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
 		   const_data_t data, mach_msg_type_number_t data_len,
@@ -145,7 +145,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
 }
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offs, int whence, off_t *new_offs)
@@ -159,7 +159,7 @@ trivfs_S_io_seek (struct trivfs_protid *cred,
 /* SELECT_TYPE is the bitwise OR of SELECT_READ, SELECT_WRITE, and SELECT_URG.
    Block until one of the indicated types of i/o can be done "quickly", and
    return the types that are then available.  */
-error_t
+kern_return_t
 trivfs_S_io_select (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    int *type)
@@ -170,7 +170,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 			    mach_port_t reply, mach_msg_type_name_t reply_type,
 			    struct timespec ts,
@@ -180,7 +180,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 }
 
 /* Truncate file.  */
-error_t
+kern_return_t
 trivfs_S_file_set_size (struct trivfs_protid *cred,
 			mach_port_t reply, mach_msg_type_name_t reply_type,
 			off_t size)
@@ -199,7 +199,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
    be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
 
-error_t
+kern_return_t
 trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
 			   int *bits)
@@ -213,7 +213,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
 			       mach_port_t reply,
 			       mach_msg_type_name_t reply_type,
@@ -225,7 +225,7 @@ trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
 				mach_port_t reply,
 				mach_msg_type_name_t reply_type,
@@ -237,7 +237,7 @@ trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
 				  mach_port_t reply,
 				  mach_msg_type_name_t reply_type,
@@ -255,7 +255,7 @@ trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
    pgrps.  This has nothing to do with the owner of a file (as
    returned by io_stat, and as used for various permission checks by
    filesystems).  An owner of 0 indicates that there is no owner.  */
-error_t
+kern_return_t
 trivfs_S_io_get_owner (struct trivfs_protid *cred,
 		       mach_port_t reply,
 		       mach_msg_type_name_t reply_type,
@@ -271,7 +271,7 @@ trivfs_S_io_get_owner (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_mod_owner (struct trivfs_protid *cred,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
 		       pid_t owner)
@@ -289,7 +289,7 @@ trivfs_S_io_mod_owner (struct trivfs_protid *cred,
 /* File syncing operations; these all do the same thing, sync the underlying
    device.  */
 
-error_t
+kern_return_t
 trivfs_S_file_sync (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    int wait, int omit_metadata)
@@ -300,7 +300,7 @@ trivfs_S_file_sync (struct trivfs_protid *cred,
     return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 trivfs_S_file_syncfs (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
 		      int wait, int dochildren)
@@ -311,7 +311,7 @@ trivfs_S_file_syncfs (struct trivfs_protid *cred,
     return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 trivfs_S_file_get_storage_info (struct trivfs_protid *cred,
 				mach_port_t reply,
 				mach_msg_type_name_t reply_type,
diff --git a/term/devio.c b/term/devio.c
index 408543e6..302cff63 100644
--- a/term/devio.c
+++ b/term/devio.c
@@ -730,7 +730,7 @@ device_write_reply (mach_port_t replyport,
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 ports_do_mach_notify_send_once (struct port_info *pi)
 {
   error_t err;
diff --git a/term/ptyio.c b/term/ptyio.c
index 51f38078..73a99e24 100644
--- a/term/ptyio.c
+++ b/term/ptyio.c
@@ -511,7 +511,7 @@ pty_io_select (struct trivfs_protid *cred, mach_port_t reply,
     }
 }
 
-error_t
+kern_return_t
 S_tioctl_tiocsig (struct trivfs_protid *cred,
 		  int sig)
 {
@@ -533,7 +533,7 @@ S_tioctl_tiocsig (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 S_tioctl_tiocpkt (struct trivfs_protid *cred,
 		  int mode)
 {
@@ -561,7 +561,7 @@ S_tioctl_tiocpkt (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 S_tioctl_tiocucntl (struct trivfs_protid *cred,
 		    int mode)
 {
@@ -589,7 +589,7 @@ S_tioctl_tiocucntl (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 S_tioctl_tiocremote (struct trivfs_protid *cred,
 		     int how)
 {
@@ -608,7 +608,7 @@ S_tioctl_tiocremote (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 S_tioctl_tiocext (struct trivfs_protid *cred,
 		  int mode)
 {
diff --git a/term/users.c b/term/users.c
index ac3d6d25..3f449c71 100644
--- a/term/users.c
+++ b/term/users.c
@@ -468,7 +468,7 @@ S_term_open_ctty (struct trivfs_protid *cred,
 
 /* Implement chown locally; don't pass the value down to the
    underlying node.  */
-error_t
+kern_return_t
 trivfs_S_file_chown (struct trivfs_protid *cred,
 		     mach_port_t reply,
 		     mach_msg_type_name_t reply_type,
@@ -514,7 +514,7 @@ out:
 }
 
 /* Implement chmod locally.  */
-error_t
+kern_return_t
 trivfs_S_file_chmod (struct trivfs_protid *cred,
 		     mach_port_t reply,
 		     mach_msg_type_name_t reply_type,
@@ -557,7 +557,7 @@ out:
 
 /* Called for user writes to the terminal as described in
    <hurd/io.defs>.  */
-error_t
+kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply,
 		   mach_msg_type_name_t replytype,
@@ -635,7 +635,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
 }
 
 /* Called for user reads from the terminal.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply,
 		  mach_msg_type_name_t replytype,
@@ -776,7 +776,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
   return !*datalen && cancel ? EINTR : 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_pathconf (struct trivfs_protid *cred,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
@@ -816,7 +816,7 @@ trivfs_S_io_pathconf (struct trivfs_protid *cred,
 }
 
 
-error_t
+kern_return_t
 trivfs_S_io_readable (struct trivfs_protid *cred,
 		      mach_port_t reply,
 		      mach_msg_type_name_t replytype,
@@ -842,7 +842,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_revoke (struct trivfs_protid *cred,
 		    mach_port_t reply,
 		    mach_msg_type_name_t replytype)
@@ -1736,7 +1736,7 @@ S_tioctl_tiocsbrk (struct trivfs_protid *cred)
   return err;
 }
 
-error_t
+kern_return_t
 trivfs_S_file_set_size (struct trivfs_protid *cred,
 			mach_port_t reply, mach_msg_type_name_t reply_type,
 			off_t size)
@@ -1755,7 +1755,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t off,
@@ -1765,7 +1765,7 @@ trivfs_S_io_seek (struct trivfs_protid *cred,
   return ESPIPE;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
 			   mach_port_t reply,
 			   mach_msg_type_name_t replytype,
@@ -1782,7 +1782,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
 
 #define HONORED_STATE_MODES (O_APPEND|O_ASYNC|O_FSYNC|O_NONBLOCK|O_NOATIME)
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
 			       mach_port_t reply,
 			       mach_msg_type_name_t replytype,
@@ -1814,7 +1814,7 @@ trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
 			     mach_port_t reply,
 			     mach_msg_type_name_t reply_type,
@@ -1838,7 +1838,7 @@ trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
 			       mach_port_t reply,
 			       mach_msg_type_name_t reply_type,
@@ -1856,7 +1856,7 @@ trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_mod_owner (struct trivfs_protid *cred,
 		    mach_port_t reply,
 		    mach_msg_type_name_t reply_type,
@@ -1872,7 +1872,7 @@ trivfs_S_io_mod_owner (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_get_owner (struct trivfs_protid *cred,
 		    mach_port_t erply,
 		    mach_msg_type_name_t reply_type,
@@ -1892,7 +1892,7 @@ trivfs_S_io_get_owner (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_get_icky_async_id (struct trivfs_protid *cred,
 			       mach_port_t reply,
 			       mach_msg_type_name_t reply_type,
@@ -1913,7 +1913,7 @@ trivfs_S_io_get_icky_async_id (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_async (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
 		   mach_port_t notify,
@@ -1987,7 +1987,7 @@ io_select_common (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select (struct trivfs_protid *cred,
 		    mach_port_t reply,
 		    mach_msg_type_name_t reply_type,
@@ -1996,7 +1996,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   return io_select_common (cred, reply, reply_type, NULL, type);
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 			    mach_port_t reply,
 			    mach_msg_type_name_t reply_type,
diff --git a/tmpfs/node.c b/tmpfs/node.c
index 8cf25090..76895612 100644
--- a/tmpfs/node.c
+++ b/tmpfs/node.c
@@ -621,7 +621,7 @@ diskfs_max_user_pager_prot (void)
   return VM_PROT_READ;		/* Probable lie that lets us go read-only.  */
 }
 
-error_t
+kern_return_t
 diskfs_S_file_get_storage_info (struct protid *cred,
 				mach_port_t **ports,
 				mach_msg_type_name_t *ports_type,
diff --git a/trans/crash.c b/trans/crash.c
index 8b624f3a..7816ecc0 100644
--- a/trans/crash.c
+++ b/trans/crash.c
@@ -990,11 +990,11 @@ kern_return_t
 S_msg_clear_some_exec_flags (mach_port_t process, mach_port_t refport,
 			     int flags)
 { return EBUSY; }
-error_t
+kern_return_t
 S_msg_report_wait (mach_port_t process, thread_t thread,
 		   string_t desc, mach_msg_id_t *rpc)
 { return EBUSY; }
-error_t
+kern_return_t
 S_msg_describe_ports (mach_port_t msgport, mach_port_t refport,
 		      const mach_port_t *ports, mach_msg_type_number_t nports,
 		      data_t *desc, mach_msg_type_number_t *desclen)
diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index f6defbf4..77f61d7f 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -280,7 +280,7 @@ netfs_check_open_permissions (struct iouser *user, struct node *np,
 			  flags & (O_RDWR|O_EXEC), MACH_PORT_NULL);
 }
 
-error_t
+kern_return_t
 netfs_S_dir_lookup (struct protid *diruser,
 		    const_string_t filename,
 		    int flags,
@@ -1022,7 +1022,7 @@ netfs_S_file_exec (struct protid *user,
 				  destroynames, destroynameslen);
 }
 
-error_t
+kern_return_t
 netfs_S_io_map (struct protid *user,
 		mach_port_t *rdobj, mach_msg_type_name_t *rdobjtype,
 		mach_port_t *wrobj, mach_msg_type_name_t *wrobjtype)
@@ -1039,7 +1039,7 @@ netfs_S_io_map (struct protid *user,
   return err;
 }
 
-error_t
+kern_return_t
 netfs_S_io_map_cntl (struct protid *user,
                      mach_port_t *obj,
                      mach_msg_type_name_t *objtype)
@@ -1056,7 +1056,7 @@ netfs_S_io_map_cntl (struct protid *user,
   return err;
 }
 
-error_t
+kern_return_t
 netfs_S_io_identity (struct protid *user,
 		     mach_port_t *id,
 		     mach_msg_type_name_t *idtype,
@@ -1079,7 +1079,7 @@ netfs_S_io_identity (struct protid *user,
 }
 
 #define NETFS_S_SIMPLE(name)			\
-error_t						\
+kern_return_t					\
 netfs_S_##name (struct protid *user)		\
 {						\
   error_t err;					\
@@ -1100,7 +1100,7 @@ NETFS_S_SIMPLE (io_readnotify)
 NETFS_S_SIMPLE (io_readsleep)
 NETFS_S_SIMPLE (io_sigio)
 
-error_t
+kern_return_t
 netfs_S_io_prenotify (struct protid *user,
                       vm_offset_t start, vm_offset_t stop)
 {
@@ -1115,7 +1115,7 @@ netfs_S_io_prenotify (struct protid *user,
   return err;
 }
 
-error_t
+kern_return_t
 netfs_S_io_postnotify (struct protid *user,
                        vm_offset_t start, vm_offset_t stop)
 {
diff --git a/trans/fifo.c b/trans/fifo.c
index 2f199112..e006dc91 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -320,7 +320,7 @@ trivfs_goaway (struct trivfs_control *cntl, int flags)
    implement io_map but not io_map_cntl.  Some objects do not provide
    mapping; they will set none of the ports and return an error.  Such
    objects can still be accessed by io_read and io_write.  */
-error_t
+kern_return_t
 trivfs_S_io_map (struct trivfs_protid *cred,
 		 mach_port_t reply, mach_msg_type_name_t replytype,
 		 memory_object_t *rdobj,
@@ -336,7 +336,7 @@ trivfs_S_io_map (struct trivfs_protid *cred,
 /* Read data from an IO object.  If offset if -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_name_t *data_len,
@@ -367,7 +367,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 /* Tell how much data can be read from the object without blocking for
    a "long time" (this should be the same meaning of "long time" used
    by the nonblocking flag.  */
-error_t
+kern_return_t
 trivfs_S_io_readable (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
 		      vm_size_t *amount)
@@ -393,7 +393,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
 /* ---------------------------------------------------------------- */
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offset, int whence, off_t *new_offset)
@@ -475,7 +475,7 @@ io_select_common (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    int *select_type)
@@ -483,7 +483,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   return io_select_common (cred, reply, reply_type, NULL, select_type);
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 			    mach_port_t reply, mach_msg_type_name_t reply_type,
 			    struct timespec ts,
@@ -501,7 +501,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
    object at a time; servers implement congestion control by delaying
    responses to io_write.  Servers may drop data (returning ENOBUFS)
    if they recevie more than one write when not prepared for it.  */
-error_t
+kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
 		   const_data_t data, mach_msg_type_name_t data_len,
@@ -532,7 +532,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
 
 /* ---------------------------------------------------------------- */
 
-error_t
+kern_return_t
 trivfs_S_file_set_size (struct trivfs_protid *cred,
 			mach_port_t reply, mach_msg_type_name_t reply_type,
 			off_t size)
@@ -546,7 +546,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
    be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
 
-error_t
+kern_return_t
 trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
 			   int *bits)
@@ -560,7 +560,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
 			      mach_port_t reply,
 			      mach_msg_type_name_t reply_type,
@@ -572,7 +572,7 @@ trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
 				mach_port_t reply,
 				mach_msg_type_name_t reply_type,
@@ -584,7 +584,7 @@ trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
 				  mach_port_t reply,
 				  mach_msg_type_name_t reply_type,
@@ -604,7 +604,7 @@ trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
    returned by io_stat, and as used for various permission checks by
    filesystems).  An owner of 0 indicates that there is no owner.  */
 
-error_t
+kern_return_t
 trivfs_S_io_get_owner (struct trivfs_protid *cred,
 		       mach_port_t reply,
 		       mach_msg_type_name_t reply_type,
@@ -616,7 +616,7 @@ trivfs_S_io_get_owner (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_mod_owner (struct trivfs_protid *cred,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
 		       pid_t owner)
diff --git a/trans/firmlink.c b/trans/firmlink.c
index 6e2798e6..4bd66062 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -203,7 +203,7 @@ trivfs_goaway (struct trivfs_control *cntl, int flags)
 /* Read data from an IO object.  If offset if -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_number_t *data_len,
@@ -241,7 +241,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 /* Tell how much data can be read from the object without blocking for
    a "long time" (this should be the same meaning of "long time" used
    by the nonblocking flag.  */
-error_t
+kern_return_t
 trivfs_S_io_readable (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
 		      vm_size_t *amount)
@@ -258,7 +258,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
 }
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offset, int whence, off_t *new_offset)
@@ -271,7 +271,7 @@ trivfs_S_io_seek (struct trivfs_protid *cred,
    return the types that are then available.  ID_TAG is returned as passed; it
    is just for the convenience of the user in matching up reply messages with
    specific requests sent.  */
-error_t
+kern_return_t
 trivfs_S_io_select (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    int *type)
@@ -279,7 +279,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 			    mach_port_t reply, mach_msg_type_name_t reply_type,
 			    struct timespec ts,
diff --git a/trans/hello-mt.c b/trans/hello-mt.c
index e99ba754..f39dd9ab 100644
--- a/trans/hello-mt.c
+++ b/trans/hello-mt.c
@@ -121,7 +121,7 @@ close_hook (struct trivfs_peropen *peropen)
 /* Read data from an IO object.  If offset is -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMOUNT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_number_t *data_len,
@@ -180,7 +180,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offs, int whence, off_t *new_offs)
diff --git a/trans/hello.c b/trans/hello.c
index 0405fad3..44785ff2 100644
--- a/trans/hello.c
+++ b/trans/hello.c
@@ -112,7 +112,7 @@ close_hook (struct trivfs_peropen *peropen)
 /* Read data from an IO object.  If offset is -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMOUNT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_number_t *data_len,
@@ -160,7 +160,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offs, int whence, off_t *new_offs)
diff --git a/trans/ifsock.c b/trans/ifsock.c
index 908fe135..f14b5e72 100644
--- a/trans/ifsock.c
+++ b/trans/ifsock.c
@@ -123,7 +123,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
   exit (0);
 }
 
-error_t
+kern_return_t
 S_ifsock_getsockaddr (struct trivfs_protid *cred,
 		      mach_port_t *address)
 {
diff --git a/trans/mtab.c b/trans/mtab.c
index e1d7d1c7..b5b4a9a8 100644
--- a/trans/mtab.c
+++ b/trans/mtab.c
@@ -654,7 +654,7 @@ close_hook (struct trivfs_peropen *peropen)
 /* Read data from an IO object.	 If offset is -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMOUNT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_number_t *data_len,
@@ -718,7 +718,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offs, int whence, off_t *new_offs)
@@ -844,7 +844,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
 			      mach_port_t reply,
 			      mach_msg_type_name_t replytype,
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index 88059983..7880eb24 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -505,7 +505,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
    implement io_map but not io_map_cntl.  Some objects do not provide
    mapping; they will set none of the ports and return an error.  Such
    objects can still be accessed by io_read and io_write.  */
-error_t
+kern_return_t
 trivfs_S_io_map (struct trivfs_protid *cred,
 		 mach_port_t reply, mach_msg_type_name_t replytype,
 		 memory_object_t *rdobj,
@@ -521,7 +521,7 @@ trivfs_S_io_map (struct trivfs_protid *cred,
 /* Read data from an IO object.  If offset if -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_name_t *data_len,
@@ -553,7 +553,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 /* Tell how much data can be read from the object without blocking for
    a "long time" (this should be the same meaning of "long time" used
    by the nonblocking flag.  */
-error_t
+kern_return_t
 trivfs_S_io_readable (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
 		      vm_size_t *amount)
@@ -580,7 +580,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
 /* ---------------------------------------------------------------- */
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offset, int whence, off_t *new_offset)
@@ -662,7 +662,7 @@ io_select_common (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    int *select_type)
@@ -670,7 +670,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   return io_select_common (cred, reply, reply_type, NULL, select_type);
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 			    mach_port_t reply, mach_msg_type_name_t reply_type,
 			    struct timespec ts,
@@ -688,7 +688,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
    object at a time; servers implement congestion control by delaying
    responses to io_write.  Servers may drop data (returning ENOBUFS)
    if they recevie more than one write when not prepared for it.  */
-error_t
+kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
 		   const_data_t data, mach_msg_type_name_t data_len,
@@ -715,7 +715,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
 /* ---------------------------------------------------------------- */
 
 /* Truncate file.  */
-error_t
+kern_return_t
 trivfs_S_file_set_size (struct trivfs_protid *cred,
 			mach_port_t reply, mach_msg_type_name_t reply_type,
 			off_t size)
@@ -730,7 +730,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
    be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
 
-error_t
+kern_return_t
 trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
 			   int *bits)
@@ -744,7 +744,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
 			      mach_port_t reply,
 			      mach_msg_type_name_t reply_type,
@@ -756,7 +756,7 @@ trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
 				mach_port_t reply,
 				mach_msg_type_name_t reply_type,
@@ -768,7 +768,7 @@ trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
 				  mach_port_t reply,
 				  mach_msg_type_name_t reply_type,
@@ -788,7 +788,7 @@ trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
    returned by io_stat, and as used for various permission checks by
    filesystems).  An owner of 0 indicates that there is no owner.  */
 
-error_t
+kern_return_t
 trivfs_S_io_get_owner (struct trivfs_protid *cred,
 		       mach_port_t reply,
 		       mach_msg_type_name_t reply_type,
@@ -800,7 +800,7 @@ trivfs_S_io_get_owner (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_mod_owner (struct trivfs_protid *cred,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
 		       pid_t owner)
@@ -818,7 +818,7 @@ trivfs_S_io_mod_owner (struct trivfs_protid *cred,
    the command line arguments.  If the recipient accepts the request, he
    (or some delegate) should send fsys_startup to REQUESTOR to start the
    filesystem up.  */
-error_t
+kern_return_t
 trivfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
diff --git a/trans/null.c b/trans/null.c
index f4ba5582..19a71eba 100644
--- a/trans/null.c
+++ b/trans/null.c
@@ -269,7 +269,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
 			      mach_port_t reply,
 			      mach_msg_type_name_t replytype,
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index e44db152..386f1b62 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -217,7 +217,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
 			       mach_port_t reply,
 			       mach_msg_type_name_t replytype,
diff --git a/trans/random.c b/trans/random.c
index ea1f780e..b68354e1 100644
--- a/trans/random.c
+++ b/trans/random.c
@@ -314,7 +314,7 @@ trivfs_goaway (struct trivfs_control *cntl, int flags)
 /* Read data from an IO object.  If offset is -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMOUNT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_number_t *data_len,
@@ -371,7 +371,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
    object at a time; servers implement congestion control by delaying
    responses to io_write.  Servers may drop data (returning ENOBUFS)
    if they receive more than one write when not prepared for it.  */
-error_t
+kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
                    mach_port_t reply,
                    mach_msg_type_name_t replytype,
@@ -437,7 +437,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
 
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  loff_t offs, int whence, loff_t *new_offs)
@@ -452,7 +452,7 @@ trivfs_S_io_seek (struct trivfs_protid *cred,
 /* Change the size of the file.  If the size increases, new blocks are
    zero-filled.  After successful return, it is safe to reference mapped
    areas of the file up to NEW_SIZE.  */
-error_t
+kern_return_t
 trivfs_S_file_set_size (struct trivfs_protid *cred,
                         mach_port_t reply, mach_msg_type_name_t reply_type,
                         loff_t size)
@@ -468,7 +468,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
    will tell you which of O_READ, O_WRITE, and O_EXEC the object can
    be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
                               mach_port_t reply,
                               mach_msg_type_name_t reply_type,
@@ -480,7 +480,7 @@ trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
                                 mach_port_t reply,
                                 mach_msg_type_name_t reply_type,
@@ -492,7 +492,7 @@ trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_get_owner (struct trivfs_protid *cred,
                        mach_port_t reply,
                        mach_msg_type_name_t reply_type,
@@ -505,7 +505,7 @@ trivfs_S_io_get_owner (struct trivfs_protid *cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_mod_owner (struct trivfs_protid *cred,
                        mach_port_t reply, mach_msg_type_name_t reply_type,
                        pid_t owner)
@@ -524,7 +524,7 @@ trivfs_S_io_mod_owner (struct trivfs_protid *cred,
    implement io_map but not io_map_cntl.  Some objects do not provide
    mapping; they will set none of the ports and return an error.  Such
    objects can still be accessed by io_read and io_write.  */
-error_t
+kern_return_t
 trivfs_S_io_map(struct trivfs_protid *cred,
                        mach_port_t reply, mach_msg_type_name_t reply_type,
                 mach_port_t *rdobj,
diff --git a/trans/streamio.c b/trans/streamio.c
index 991f9ad5..e42ff908 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -480,7 +480,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
 }
 
 
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  data_t *data, mach_msg_type_number_t *data_len,
@@ -503,7 +503,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_readable (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
 		      vm_size_t *amount)
@@ -522,7 +522,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
 		   const_data_t data, mach_msg_type_number_t data_len,
@@ -542,7 +542,7 @@ trivfs_S_io_write (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
 		  off_t offs, int whence, off_t *new_offs)
@@ -610,7 +610,7 @@ io_select_common (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    int *type)
@@ -618,7 +618,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   return io_select_common (cred, reply, reply_type, NULL, type);
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 			    mach_port_t reply, mach_msg_type_name_t reply_type,
 			    struct timespec ts,
@@ -627,7 +627,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
   return io_select_common (cred, reply, reply_type, &ts, type);
 }
 
-error_t
+kern_return_t
 trivfs_S_file_set_size (struct trivfs_protid *cred,
 			mach_port_t reply, mach_msg_type_name_t reply_type,
 			off_t size)
@@ -642,7 +642,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
 			   int *bits)
@@ -656,7 +656,7 @@ trivfs_S_io_get_openmodes (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
 			       mach_port_t reply,
 			       mach_msg_type_name_t reply_type,
@@ -668,7 +668,7 @@ trivfs_S_io_set_all_openmodes (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
 				mach_port_t reply,
 				mach_msg_type_name_t reply_type,
@@ -680,7 +680,7 @@ trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
 				  mach_port_t reply,
 				  mach_msg_type_name_t reply_type,
@@ -692,7 +692,7 @@ trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
     return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_file_sync (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    int wait, int omit_metadata)
@@ -708,7 +708,7 @@ trivfs_S_file_sync (struct trivfs_protid *cred,
   return err;
 }
 
-error_t
+kern_return_t
 trivfs_S_file_syncfs (struct trivfs_protid *cred,
 		      mach_port_t reply, mach_msg_type_name_t reply_type,
 		      int wait, int dochildren)
@@ -1038,8 +1038,8 @@ dev_read (size_t amount, void **buf, size_t *len, int nowait)
   return err;
 }
 
-error_t
-device_read_reply_inband (mach_port_t reply, error_t errorcode,
+kern_return_t
+device_read_reply_inband (mach_port_t reply, kern_return_t errorcode,
 			  const io_buf_ptr_inband_t data, mach_msg_type_number_t datalen)
 {
   if (reply != phys_reply)
@@ -1158,8 +1158,8 @@ dev_write (const void *buf, size_t len, size_t *amount, int nowait)
   return err;
 }
 
-error_t
-device_write_reply_inband (mach_port_t reply, error_t returncode, int amount)
+kern_return_t
+device_write_reply_inband (mach_port_t reply, kern_return_t returncode, int amount)
 {
   if (reply != phys_reply_writes)
     return EOPNOTSUPP;
diff --git a/trans/symlink.c b/trans/symlink.c
index 68f056c4..0046378e 100644
--- a/trans/symlink.c
+++ b/trans/symlink.c
@@ -122,7 +122,7 @@ main (int argc, char **argv)
     }
 }
 
-error_t
+kern_return_t
 S_fsys_getroot (mach_port_t fsys_t,
 		mach_port_t dotdotnode,
 		const id_t *uids,
@@ -164,13 +164,13 @@ S_fsys_getroot (mach_port_t fsys_t,
   return 0;
 }
 
-error_t
+kern_return_t
 S_fsys_goaway (mach_port_t control, int flags)
 {
   exit (0);
 }
 
-error_t
+kern_return_t
 S_fsys_syncfs (mach_port_t control,
 	       int wait,
 	       int recurse)