]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/vfs/vfs_syscalls.c
xnu-4903.221.2.tar.gz
[apple/xnu.git] / bsd / vfs / vfs_syscalls.c
index 5675ce21f2d0af3554496d159841f264213810af..767d352c6993af8969b2a1f37520912eee24e5a7 100644 (file)
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 1995-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Copyright (c) 1995-2017 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1989, 1993
  *
  *     @(#)vfs_syscalls.c      8.41 (Berkeley) 6/15/95
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/quota.h>
 #include <sys/kdebug.h>
 #include <sys/fsevents.h>
+#include <sys/imgsrc.h>
 #include <sys/sysproto.h>
 #include <sys/xattr.h>
+#include <sys/fcntl.h>
+#include <sys/fsctl.h>
 #include <sys/ubc_internal.h>
+#include <sys/disk.h>
+#include <sys/content_protection.h>
+#include <sys/clonefile.h>
+#include <sys/snapshot.h>
+#include <sys/priv.h>
 #include <machine/cons.h>
 #include <machine/limits.h>
 #include <miscfs/specfs/specdev.h>
 
-#include <bsm/audit_kernel.h>
+#include <vfs/vfs_disk_conditioner.h>
+
+#include <security/audit/audit.h>
 #include <bsm/audit_kevents.h>
 
 #include <mach/mach_types.h>
 #include <kern/kern_types.h>
 #include <kern/kalloc.h>
+#include <kern/task.h>
 
 #include <vm/vm_pageout.h>
+#include <vm/vm_protos.h>
 
-#include <architecture/byte_order.h>
 #include <libkern/OSAtomic.h>
+#include <pexpert/pexpert.h>
+#include <IOKit/IOBSD.h>
 
+#if ROUTEFS
+#include <miscfs/routefs/routefs.h>
+#endif /* ROUTEFS */
 
-/*
- * The currently logged-in user, for ownership of files/directories whose on-disk
- * permissions are ignored:
- */
-uid_t console_user;
+#if CONFIG_MACF
+#include <security/mac.h>
+#include <security/mac_framework.h>
+#endif
+
+#if CONFIG_FSE
+#define GET_PATH(x) \
+       (x) = get_pathbuff();
+#define RELEASE_PATH(x) \
+       release_pathbuff(x);
+#else
+#define GET_PATH(x)    \
+       MALLOC_ZONE((x), char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
+#define RELEASE_PATH(x) \
+       FREE_ZONE((x), MAXPATHLEN, M_NAMEI);
+#endif /* CONFIG_FSE */
+
+#ifndef HFS_GET_BOOT_INFO
+#define HFS_GET_BOOT_INFO   (FCNTL_FS_SPECIFIC_BASE + 0x00004)
+#endif
+
+#ifndef HFS_SET_BOOT_INFO
+#define HFS_SET_BOOT_INFO   (FCNTL_FS_SPECIFIC_BASE + 0x00005)
+#endif
+
+#ifndef APFSIOC_REVERT_TO_SNAPSHOT
+#define APFSIOC_REVERT_TO_SNAPSHOT  _IOW('J', 1, u_int64_t)
+#endif
+
+extern void disk_conditioner_unmount(mount_t mp);
+
+/* struct for checkdirs iteration */
+struct cdirargs {
+       vnode_t olddp;
+       vnode_t newdp;
+};
+/* callback  for checkdirs iteration */
+static int checkdirs_callback(proc_t p, void * arg);
 
 static int change_dir(struct nameidata *ndp, vfs_context_t ctx);
-static void checkdirs(struct vnode *olddp, vfs_context_t ctx);
+static int checkdirs(vnode_t olddp, vfs_context_t ctx);
 void enablequotas(struct mount *mp, vfs_context_t ctx);
 static int getfsstat_callback(mount_t mp, void * arg);
 static int getutimes(user_addr_t usrtvp, struct timespec *tsp);
-static int setutimes(vfs_context_t ctx, struct vnode *vp, const struct timespec *ts, int nullflag);
+static int setutimes(vfs_context_t ctx, vnode_t vp, const struct timespec *ts, int nullflag);
 static int sync_callback(mount_t, void *);
-static int munge_statfs(struct mount *mp, struct vfsstatfs *sfsp, 
-                       user_addr_t bufp, int *sizep, boolean_t is_64_bit, 
+static int munge_statfs(struct mount *mp, struct vfsstatfs *sfsp,
+                       user_addr_t bufp, int *sizep, boolean_t is_64_bit,
                                                boolean_t partial_copy);
+static int statfs64_common(struct mount *mp, struct vfsstatfs *sfsp,
+                       user_addr_t bufp);
+static int fsync_common(proc_t p, struct fsync_args *uap, int flags);
+static int mount_common(char *fstypename, vnode_t pvp, vnode_t vp,
+                        struct componentname *cnp, user_addr_t fsmountargs,
+                        int flags, uint32_t internal_flags, char *labelstr, boolean_t kernelmount,
+                        vfs_context_t ctx);
+void vfs_notify_mount(vnode_t pdvp);
 
-__private_extern__ int sync_internal(void);
+int prepare_coveredvp(vnode_t vp, vfs_context_t ctx, struct componentname *cnp, const char *fsname, boolean_t skip_auth);
 
-#ifdef __APPLE_API_OBSOLETE
-struct fstatv_args {
-       int fd;                 /* file descriptor of the target file */
-       struct vstat *vsb;      /* vstat structure for returned info  */
-};
-struct lstatv_args {
-       const char *path;       /* pathname of the target file       */
-       struct vstat *vsb;      /* vstat structure for returned info */
-};
-struct mkcomplex_args {
-        const char *path;      /* pathname of the file to be created */
-               mode_t mode;            /* access mode for the newly created file */
-        u_long type;           /* format of the complex file */
-};
-struct statv_args {
-        const char *path;      /* pathname of the target file       */
-        struct vstat *vsb;     /* vstat structure for returned info */
-};
+struct fd_vn_data * fg_vn_data_alloc(void);
 
-int fstatv(struct proc *p, struct fstatv_args *uap, register_t *retval);
-int lstatv(struct proc *p, struct lstatv_args *uap, register_t *retval);
-int mkcomplex(struct proc *p, struct mkcomplex_args *uap, register_t *retval);
-int statv(struct proc *p, struct statv_args *uap, register_t *retval);
+/*
+ * Max retries for ENOENT returns from vn_authorize_{rmdir, unlink, rename}
+ * Concurrent lookups (or lookups by ids) on hard links can cause the
+ * vn_getpath (which does not re-enter the filesystem as vn_getpath_fsenter
+ * does) to return ENOENT as the path cannot be returned from the name cache
+ * alone. We have no option but to retry and hope to get one namei->reverse path
+ * generation done without an intervening lookup, lookup by id on the hard link
+ * item. This is only an issue for MAC hooks which cannot reenter the filesystem
+ * which currently are the MAC hooks for rename, unlink and rmdir.
+ */
+#define MAX_AUTHORIZE_ENOENT_RETRIES 1024
 
-#endif /* __APPLE_API_OBSOLETE */
+static int rmdirat_internal(vfs_context_t, int, user_addr_t, enum uio_seg);
 
-#if UNION
-extern int (**union_vnodeop_p)(void *);
-extern struct vnode *union_dircache(struct vnode*, struct proc*);
-#endif /* UNION */
+static int fsgetpath_internal(vfs_context_t, int, uint64_t, vm_size_t, caddr_t, int *);
 
-/* counts number of mount and unmount operations */
-unsigned int vfs_nummntops=0;
+#ifdef CONFIG_IMGSRC_ACCESS
+static int authorize_devpath_and_update_mntfromname(mount_t mp, user_addr_t devpath, vnode_t *devvpp, vfs_context_t ctx);
+static int place_mount_and_checkdirs(mount_t mp, vnode_t vp, vfs_context_t ctx);
+static void undo_place_on_covered_vp(mount_t mp, vnode_t vp);
+static int mount_begin_update(mount_t mp, vfs_context_t ctx, int flags);
+static void mount_end_update(mount_t mp);
+static int relocate_imageboot_source(vnode_t pvp, vnode_t vp, struct componentname *cnp, const char *fsname, vfs_context_t ctx, boolean_t is64bit, user_addr_t fsmountargs, boolean_t by_index);
+#endif /* CONFIG_IMGSRC_ACCESS */
+
+//snapshot functions
+#if CONFIG_MNT_ROOTSNAP
+static int snapshot_root(int dirfd, user_addr_t name, uint32_t flags, vfs_context_t ctx);
+#else
+static int snapshot_root(int dirfd, user_addr_t name, uint32_t flags, vfs_context_t ctx) __attribute__((unused));
+#endif
 
-extern struct fileops vnops;
+int (*union_dircheckp)(struct vnode **, struct fileproc *, vfs_context_t);
 
-extern void mount_list_add(mount_t mp);
-extern void mount_list_remove(mount_t mp);
-extern int mount_refdrain(mount_t mp);
-extern int vcount(struct vnode *vp);
+__private_extern__
+int sync_internal(void);
 
+__private_extern__
+int unlink1(vfs_context_t, vnode_t, user_addr_t, enum uio_seg, int);
+
+extern lck_grp_t *fd_vn_lck_grp;
+extern lck_grp_attr_t *fd_vn_lck_grp_attr;
+extern lck_attr_t *fd_vn_lck_attr;
+
+/*
+ * incremented each time a mount or unmount operation occurs
+ * used to invalidate the cached value of the rootvp in the
+ * mount structure utilized by cache_lookup_path
+ */
+uint32_t mount_generation = 0;
+
+/* counts number of mount and unmount operations */
+unsigned int vfs_nummntops=0;
+
+extern const struct fileops vnops;
+#if CONFIG_APPLEDOUBLE
+extern errno_t rmdir_remove_orphaned_appleDouble(vnode_t, vfs_context_t, int *);
+#endif /* CONFIG_APPLEDOUBLE */
 
 /*
  * Virtual File System System Calls
  */
 
+#if NFSCLIENT || DEVFS || ROUTEFS
+/*
+ * Private in-kernel mounting spi (NFS only, not exported)
+ */
+ __private_extern__
+boolean_t
+vfs_iskernelmount(mount_t mp)
+{
+       return ((mp->mnt_kern_flag & MNTK_KERNEL_MOUNT) ? TRUE : FALSE);
+}
+
+ __private_extern__
+int
+kernel_mount(char *fstype, vnode_t pvp, vnode_t vp, const char *path,
+             void *data, __unused size_t datalen, int syscall_flags, __unused uint32_t kern_flags, vfs_context_t ctx)
+{
+       struct nameidata nd;
+       boolean_t did_namei;
+       int error;
+
+       NDINIT(&nd, LOOKUP, OP_MOUNT, FOLLOW | AUDITVNPATH1 | WANTPARENT,
+              UIO_SYSSPACE, CAST_USER_ADDR_T(path), ctx);
+
+       /*
+        * Get the vnode to be covered if it's not supplied
+        */
+       if (vp == NULLVP) {
+               error = namei(&nd);
+               if (error)
+                       return (error);
+               vp = nd.ni_vp;
+               pvp = nd.ni_dvp;
+               did_namei = TRUE;
+       } else {
+               char *pnbuf = CAST_DOWN(char *, path);
+
+               nd.ni_cnd.cn_pnbuf = pnbuf;
+               nd.ni_cnd.cn_pnlen = strlen(pnbuf) + 1;
+               did_namei = FALSE;
+       }
+
+       error = mount_common(fstype, pvp, vp, &nd.ni_cnd, CAST_USER_ADDR_T(data),
+                            syscall_flags, kern_flags, NULL, TRUE, ctx);
+
+       if (did_namei) {
+               vnode_put(vp);
+               vnode_put(pvp);
+               nameidone(&nd);
+       }
+
+       return (error);
+}
+#endif /* NFSCLIENT || DEVFS */
+
 /*
  * Mount a file system.
  */
 /* ARGSUSED */
 int
-mount(struct proc *p, register struct mount_args *uap, __unused register_t *retval)
+mount(proc_t p, struct mount_args *uap, __unused int32_t *retval)
 {
-       struct vnode *vp;
+       struct __mac_mount_args muap;
+
+       muap.type = uap->type;
+       muap.path = uap->path;
+       muap.flags = uap->flags;
+       muap.data = uap->data;
+       muap.mac_p = USER_ADDR_NULL;
+       return (__mac_mount(p, &muap, retval));
+}
+
+int
+fmount(__unused proc_t p, struct fmount_args *uap, __unused int32_t *retval)
+{
+       struct componentname    cn;
+       vfs_context_t           ctx = vfs_context_current();
+       size_t                  dummy = 0;
+       int                     error;
+       int                     flags = uap->flags;
+       char                    fstypename[MFSNAMELEN];
+       char                    *labelstr = NULL; /* regular mount call always sets it to NULL for __mac_mount() */
+       vnode_t                 pvp;
+       vnode_t                 vp;
+
+       AUDIT_ARG(fd, uap->fd);
+       AUDIT_ARG(fflags, flags);
+       /* fstypename will get audited by mount_common */
+
+       /* Sanity check the flags */
+       if (flags & (MNT_IMGSRC_BY_INDEX|MNT_ROOTFS)) {
+               return (ENOTSUP);
+       }
+
+       if (flags & MNT_UNION) {
+               return (EPERM);
+       }
+
+       error = copyinstr(uap->type, fstypename, MFSNAMELEN, &dummy);
+       if (error) {
+               return (error);
+       }
+
+       if ((error = file_vnode(uap->fd, &vp)) != 0) {
+               return (error);
+       }
+
+       if ((error = vnode_getwithref(vp)) != 0) {
+               file_drop(uap->fd);
+               return (error);
+       }
+
+       pvp = vnode_getparent(vp);
+       if (pvp == NULL) {
+               vnode_put(vp);
+               file_drop(uap->fd);
+               return (EINVAL);
+       }
+
+       memset(&cn, 0, sizeof(struct componentname));
+       MALLOC(cn.cn_pnbuf, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
+       cn.cn_pnlen = MAXPATHLEN;
+
+       if((error = vn_getpath(vp, cn.cn_pnbuf, &cn.cn_pnlen)) != 0) {
+               FREE(cn.cn_pnbuf, M_TEMP);
+               vnode_put(pvp);
+               vnode_put(vp);
+               file_drop(uap->fd);
+               return (error);
+       }
+
+       error = mount_common(fstypename, pvp, vp, &cn, uap->data, flags, 0, labelstr, FALSE, ctx);
+
+       FREE(cn.cn_pnbuf, M_TEMP);
+       vnode_put(pvp);
+       vnode_put(vp);
+       file_drop(uap->fd);
+
+       return (error);
+}
+
+void
+vfs_notify_mount(vnode_t pdvp)
+{
+       vfs_event_signal(NULL, VQ_MOUNT, (intptr_t)NULL);
+       lock_vnode_and_post(pdvp, NOTE_WRITE);
+}
+
+/*
+ * __mac_mount:
+ *     Mount a file system taking into account MAC label behavior.
+ *     See mount(2) man page for more information
+ *
+ * Parameters:    p                        Process requesting the mount
+ *                uap                      User argument descriptor (see below)
+ *                retval                   (ignored)
+ *
+ * Indirect:      uap->type                Filesystem type
+ *                uap->path                Path to mount
+ *                uap->data                Mount arguments
+ *                uap->mac_p               MAC info
+ *                uap->flags               Mount flags
+ *
+ *
+ * Returns:        0                       Success
+ *                !0                       Not success
+ */
+boolean_t root_fs_upgrade_try = FALSE;
+
+int
+__mac_mount(struct proc *p, register struct __mac_mount_args *uap, __unused int32_t *retval)
+{
+       vnode_t pvp = NULL;
+       vnode_t vp = NULL;
+       int need_nameidone = 0;
+       vfs_context_t ctx = vfs_context_current();
+       char fstypename[MFSNAMELEN];
+       struct nameidata nd;
+       size_t dummy=0;
+       char *labelstr = NULL;
+       int flags = uap->flags;
+       int error;
+#if CONFIG_IMGSRC_ACCESS || CONFIG_MACF
+       boolean_t is_64bit = IS_64BIT_PROCESS(p);
+#else
+#pragma unused(p)
+#endif
+       /*
+        * Get the fs type name from user space
+        */
+       error = copyinstr(uap->type, fstypename, MFSNAMELEN, &dummy);
+       if (error)
+               return (error);
+
+       /*
+        * Get the vnode to be covered
+        */
+       NDINIT(&nd, LOOKUP, OP_MOUNT, FOLLOW | AUDITVNPATH1 | WANTPARENT,
+              UIO_USERSPACE, uap->path, ctx);
+       error = namei(&nd);
+       if (error) {
+               goto out;
+       }
+       need_nameidone = 1;
+       vp = nd.ni_vp;
+       pvp = nd.ni_dvp;
+
+#ifdef CONFIG_IMGSRC_ACCESS
+       /* Mounting image source cannot be batched with other operations */
+       if (flags == MNT_IMGSRC_BY_INDEX) {
+               error = relocate_imageboot_source(pvp, vp, &nd.ni_cnd, fstypename,
+                                                 ctx, is_64bit, uap->data, (flags == MNT_IMGSRC_BY_INDEX));
+               goto out;
+       }
+#endif /* CONFIG_IMGSRC_ACCESS */
+
+#if CONFIG_MACF
+       /*
+        * Get the label string (if any) from user space
+        */
+       if (uap->mac_p != USER_ADDR_NULL) {
+               struct user_mac mac;
+               size_t ulen = 0;
+
+               if (is_64bit) {
+                       struct user64_mac mac64;
+                       error = copyin(uap->mac_p, &mac64, sizeof(mac64));
+                       mac.m_buflen = mac64.m_buflen;
+                       mac.m_string = mac64.m_string;
+               } else {
+                       struct user32_mac mac32;
+                       error = copyin(uap->mac_p, &mac32, sizeof(mac32));
+                       mac.m_buflen = mac32.m_buflen;
+                       mac.m_string = mac32.m_string;
+               }
+               if (error)
+                       goto out;
+               if ((mac.m_buflen > MAC_MAX_LABEL_BUF_LEN) ||
+                   (mac.m_buflen < 2)) {
+                       error = EINVAL;
+                       goto out;
+               }
+               MALLOC(labelstr, char *, mac.m_buflen, M_MACTEMP, M_WAITOK);
+               error = copyinstr(mac.m_string, labelstr, mac.m_buflen, &ulen);
+               if (error) {
+                       goto out;
+               }
+               AUDIT_ARG(mac_string, labelstr);
+       }
+#endif /* CONFIG_MACF */
+
+       AUDIT_ARG(fflags, flags);
+
+#if SECURE_KERNEL
+       if (flags & MNT_UNION) {
+               /* No union mounts on release kernels */
+               error = EPERM;
+               goto out;
+       }
+#endif
+
+       if ((vp->v_flag & VROOT) &&
+                       (vp->v_mount->mnt_flag & MNT_ROOTFS)) {
+               if (!(flags & MNT_UNION)) {
+                       flags |= MNT_UPDATE;
+               }
+               else {
+                       /*
+                        * For a union mount on '/', treat it as fresh
+                        * mount instead of update.
+                        * Otherwise, union mouting on '/' used to panic the
+                        * system before, since mnt_vnodecovered was found to
+                        * be NULL for '/' which is required for unionlookup
+                        * after it gets ENOENT on union mount.
+                        */
+                       flags = (flags & ~(MNT_UPDATE));
+               }
+
+#if SECURE_KERNEL
+               if ((flags & MNT_RDONLY) == 0) {
+                       /* Release kernels are not allowed to mount "/" as rw */
+                       error = EPERM;
+                       goto out;
+               }
+#endif
+               /*
+                * See 7392553 for more details on why this check exists.
+                * Suffice to say: If this check is ON and something tries
+                * to mount the rootFS RW, we'll turn off the codesign
+                * bitmap optimization.
+                */
+#if CHECK_CS_VALIDATION_BITMAP
+               if ((flags & MNT_RDONLY) == 0 ) {
+                       root_fs_upgrade_try = TRUE;
+               }
+#endif
+       }
+
+       error = mount_common(fstypename, pvp, vp, &nd.ni_cnd, uap->data, flags, 0,
+                            labelstr, FALSE, ctx);
+
+out:
+
+#if CONFIG_MACF
+       if (labelstr)
+               FREE(labelstr, M_MACTEMP);
+#endif /* CONFIG_MACF */
+
+       if (vp) {
+               vnode_put(vp);
+       }
+       if (pvp) {
+               vnode_put(pvp);
+       }
+       if (need_nameidone) {
+               nameidone(&nd);
+       }
+
+       return (error);
+}
+
+/*
+ * common mount implementation (final stage of mounting)
+
+ * Arguments:
+ *  fstypename file system type (ie it's vfs name)
+ *  pvp                parent of covered vnode
+ *  vp         covered vnode
+ *  cnp                component name (ie path) of covered vnode
+ *  flags      generic mount flags
+ *  fsmountargs        file system specific data
+ *  labelstr   optional MAC label
+ *  kernelmount        TRUE for mounts initiated from inside the kernel
+ *  ctx                caller's context
+ */
+static int
+mount_common(char *fstypename, vnode_t pvp, vnode_t vp,
+             struct componentname *cnp, user_addr_t fsmountargs, int flags, uint32_t internal_flags,
+             char *labelstr, boolean_t kernelmount, vfs_context_t ctx)
+{
+#if !CONFIG_MACF
+#pragma unused(labelstr)
+#endif
        struct vnode *devvp = NULLVP;
        struct vnode *device_vnode = NULLVP;
+#if CONFIG_MACF
+       struct vnode *rvp;
+#endif
        struct mount *mp;
-       struct vfstable *vfsp;
+       struct vfstable *vfsp = (struct vfstable *)0;
+       struct proc *p = vfs_context_proc(ctx);
        int error, flag = 0;
-       struct vnode_attr va;
-       struct vfs_context context;
-       struct nameidata nd;
-       struct nameidata nd1;
-       char fstypename[MFSNAMELEN];
-       size_t dummy=0;
        user_addr_t devpath = USER_ADDR_NULL;
-       user_addr_t fsmountargs =  uap->data;
        int ronly = 0;
        int mntalloc = 0;
-       mode_t accessmode;
-       boolean_t is_64bit;
-
-       AUDIT_ARG(fflags, uap->flags);
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-       is_64bit = proc_is64bit(p);
+       boolean_t vfsp_ref = FALSE;
+       boolean_t is_rwlock_locked = FALSE;
+       boolean_t did_rele = FALSE;
+       boolean_t have_usecount = FALSE;
 
        /*
-        * Get vnode to be covered
+        * Process an update for an existing mount
         */
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-                  UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               return (error);
-       vp = nd.ni_vp;
-       
-       if ((vp->v_flag & VROOT) &&
-               (vp->v_mount->mnt_flag & MNT_ROOTFS)) 
-                       uap->flags |= MNT_UPDATE;
-       
-       if (uap->flags & MNT_UPDATE) {
+       if (flags & MNT_UPDATE) {
                if ((vp->v_flag & VROOT) == 0) {
                        error = EINVAL;
                        goto out1;
@@ -219,7 +623,7 @@ mount(struct proc *p, register struct mount_args *uap, __unused register_t *retv
                mp = vp->v_mount;
 
                /* unmount in progress return error */
-               mount_lock(mp);
+               mount_lock_spin(mp);
                if (mp->mnt_lflag & MNT_LUNMOUNT) {
                        mount_unlock(mp);
                        error = EBUSY;
@@ -227,98 +631,113 @@ mount(struct proc *p, register struct mount_args *uap, __unused register_t *retv
                }
                mount_unlock(mp);
                lck_rw_lock_exclusive(&mp->mnt_rwlock);
+               is_rwlock_locked = TRUE;
                /*
                 * We only allow the filesystem to be reloaded if it
                 * is currently mounted read-only.
                 */
-               if ((uap->flags & MNT_RELOAD) &&
+               if ((flags & MNT_RELOAD) &&
                    ((mp->mnt_flag & MNT_RDONLY) == 0)) {
-                       lck_rw_done(&mp->mnt_rwlock);
                        error = ENOTSUP;
                        goto out1;
                }
+
+               /*
+                * If content protection is enabled, update mounts are not
+                * allowed to turn it off.
+                */
+               if ((mp->mnt_flag & MNT_CPROTECT) &&
+                          ((flags & MNT_CPROTECT) == 0)) {
+                       error = EINVAL;
+                       goto out1;
+               }
+
+#ifdef CONFIG_IMGSRC_ACCESS
+               /* Can't downgrade the backer of the root FS */
+               if ((mp->mnt_kern_flag & MNTK_BACKS_ROOT) &&
+                       (!vfs_isrdonly(mp)) && (flags & MNT_RDONLY)) {
+                       error = ENOTSUP;
+                       goto out1;
+               }
+#endif /* CONFIG_IMGSRC_ACCESS */
+
                /*
                 * Only root, or the user that did the original mount is
                 * permitted to update it.
                 */
-               if (mp->mnt_vfsstat.f_owner != kauth_cred_getuid(context.vc_ucred) &&
-                   (error = suser(context.vc_ucred, &p->p_acflag))) {
-                       lck_rw_done(&mp->mnt_rwlock);
+               if (mp->mnt_vfsstat.f_owner != kauth_cred_getuid(vfs_context_ucred(ctx)) &&
+                   (error = suser(vfs_context_ucred(ctx), &p->p_acflag))) {
+                       goto out1;
+               }
+#if CONFIG_MACF
+               error = mac_mount_check_remount(ctx, mp);
+               if (error != 0) {
                        goto out1;
                }
+#endif
                /*
                 * For non-root users, silently enforce MNT_NOSUID and MNT_NODEV,
                 * and MNT_NOEXEC if mount point is already MNT_NOEXEC.
                 */
-               if (suser(context.vc_ucred, NULL)) {
-                       uap->flags |= MNT_NOSUID | MNT_NODEV;
+               if ((!kernelmount) && suser(vfs_context_ucred(ctx), NULL)) {
+                       flags |= MNT_NOSUID | MNT_NODEV;
                        if (mp->mnt_flag & MNT_NOEXEC)
-                               uap->flags |= MNT_NOEXEC;
+                               flags |= MNT_NOEXEC;
                }
                flag = mp->mnt_flag;
 
-               mp->mnt_flag |=
-                   uap->flags & (MNT_RELOAD | MNT_FORCE | MNT_UPDATE);
+
+
+               mp->mnt_flag |= flags & (MNT_RELOAD | MNT_FORCE | MNT_UPDATE);
 
                vfsp = mp->mnt_vtable;
                goto update;
        }
-       /*
-        * If the user is not root, ensure that they own the directory
-        * onto which we are attempting to mount.
-        */
-       VATTR_INIT(&va);
-       VATTR_WANTED(&va, va_uid);
-       if ((error = vnode_getattr(vp, &va, &context)) ||
-           (va.va_uid != kauth_cred_getuid(context.vc_ucred) &&
-            (error = suser(context.vc_ucred, &p->p_acflag)))) {
-               goto out1;
-       }
+
        /*
         * For non-root users, silently enforce MNT_NOSUID and MNT_NODEV, and
         * MNT_NOEXEC if mount point is already MNT_NOEXEC.
         */
-       if (suser(context.vc_ucred, NULL)) {
-               uap->flags |= MNT_NOSUID | MNT_NODEV;
+       if ((!kernelmount) && suser(vfs_context_ucred(ctx), NULL)) {
+               flags |= MNT_NOSUID | MNT_NODEV;
                if (vp->v_mount->mnt_flag & MNT_NOEXEC)
-                       uap->flags |= MNT_NOEXEC;
-       }
-       if ( (error = VNOP_FSYNC(vp, MNT_WAIT, &context)) )
-               goto out1;
-
-       if ( (error = buf_invalidateblks(vp, BUF_WRITE_DATA, 0, 0)) )
-               goto out1;
-
-       if (vp->v_type != VDIR) {
-               error = ENOTDIR;
-               goto out1;
+                       flags |= MNT_NOEXEC;
        }
-       if ( (error = copyinstr(uap->type, fstypename, MFSNAMELEN, &dummy)) )
-               goto out1;
 
        /* XXXAUDIT: Should we capture the type on the error path as well? */
        AUDIT_ARG(text, fstypename);
        mount_list_lock();
        for (vfsp = vfsconf; vfsp; vfsp = vfsp->vfc_next)
-               if (!strcmp(vfsp->vfc_name, fstypename))
+               if (!strncmp(vfsp->vfc_name, fstypename, MFSNAMELEN)) {
+                       vfsp->vfc_refcount++;
+                       vfsp_ref = TRUE;
                        break;
+               }
        mount_list_unlock();
        if (vfsp == NULL) {
                error = ENODEV;
                goto out1;
        }
-       if (ISSET(vp->v_flag, VMOUNT) && (vp->v_mountedhere != NULL)) {
-               error = EBUSY;
-               goto out1;
-       }
-       SET(vp->v_flag, VMOUNT);
 
        /*
-        * Allocate and initialize the filesystem.
+        * VFC_VFSLOCALARGS is not currently supported for kernel mounts
+        */
+       if (kernelmount && (vfsp->vfc_vfsflags & VFC_VFSLOCALARGS)) {
+               error = EINVAL;  /* unsupported request */
+               goto out1;
+       }
+
+       error = prepare_coveredvp(vp, ctx, cnp, fstypename, ((internal_flags & KERNEL_MOUNT_NOAUTH) != 0));
+       if (error != 0) {
+               goto out1;
+       }
+
+       /*
+        * Allocate and initialize the filesystem (mount_t)
         */
-       MALLOC_ZONE(mp, struct mount *, (u_long)sizeof(struct mount),
+       MALLOC_ZONE(mp, struct mount *, (u_int32_t)sizeof(struct mount),
                M_MOUNT, M_WAITOK);
-       bzero((char *)mp, (u_long)sizeof(struct mount));
+       bzero((char *)mp, (u_int32_t)sizeof(struct mount));
        mntalloc = 1;
 
        /* Initialize the default IO constraints */
@@ -327,67 +746,118 @@ mount(struct proc *p, register struct mount_args *uap, __unused register_t *retv
        mp->mnt_maxsegreadsize = mp->mnt_maxreadcnt;
        mp->mnt_maxsegwritesize = mp->mnt_maxwritecnt;
        mp->mnt_devblocksize = DEV_BSIZE;
+       mp->mnt_alignmentmask = PAGE_MASK;
+       mp->mnt_ioqueue_depth = MNT_DEFAULT_IOQUEUE_DEPTH;
+       mp->mnt_ioscale = 1;
+       mp->mnt_ioflags = 0;
+       mp->mnt_realrootvp = NULLVP;
+       mp->mnt_authcache_ttl = CACHED_LOOKUP_RIGHT_TTL;
 
        TAILQ_INIT(&mp->mnt_vnodelist);
        TAILQ_INIT(&mp->mnt_workerqueue);
        TAILQ_INIT(&mp->mnt_newvnodes);
        mount_lock_init(mp);
        lck_rw_lock_exclusive(&mp->mnt_rwlock);
+       is_rwlock_locked = TRUE;
        mp->mnt_op = vfsp->vfc_vfsops;
        mp->mnt_vtable = vfsp;
-       mount_list_lock();
-       vfsp->vfc_refcount++;
-       mount_list_unlock();
        //mp->mnt_stat.f_type = vfsp->vfc_typenum;
        mp->mnt_flag |= vfsp->vfc_flags & MNT_VISFLAGMASK;
-       strncpy(mp->mnt_vfsstat.f_fstypename, vfsp->vfc_name, MFSTYPENAMELEN);
-       strncpy(mp->mnt_vfsstat.f_mntonname, nd.ni_cnd.cn_pnbuf, MAXPATHLEN);
+       strlcpy(mp->mnt_vfsstat.f_fstypename, vfsp->vfc_name, MFSTYPENAMELEN);
+       strlcpy(mp->mnt_vfsstat.f_mntonname, cnp->cn_pnbuf, MAXPATHLEN);
        mp->mnt_vnodecovered = vp;
-       mp->mnt_vfsstat.f_owner = kauth_cred_getuid(context.vc_ucred);
+       mp->mnt_vfsstat.f_owner = kauth_cred_getuid(vfs_context_ucred(ctx));
+       mp->mnt_throttle_mask = LOWPRI_MAX_NUM_DEV - 1;
+       mp->mnt_devbsdunit = 0;
 
        /* XXX 3762912 hack to support HFS filesystem 'owner' - filesystem may update later */
        vfs_setowner(mp, KAUTH_UID_NONE, KAUTH_GID_NONE);
-       
+
+#if NFSCLIENT || DEVFS || ROUTEFS
+       if (kernelmount)
+               mp->mnt_kern_flag |= MNTK_KERNEL_MOUNT;
+       if ((internal_flags & KERNEL_MOUNT_PERMIT_UNMOUNT) != 0)
+               mp->mnt_kern_flag |= MNTK_PERMIT_UNMOUNT;
+#endif /* NFSCLIENT || DEVFS */
+
 update:
+
        /*
         * Set the mount level flags.
         */
-       if (uap->flags & MNT_RDONLY)
+       if (flags & MNT_RDONLY)
                mp->mnt_flag |= MNT_RDONLY;
-       else if (mp->mnt_flag & MNT_RDONLY)
+       else if (mp->mnt_flag & MNT_RDONLY) {
+               // disallow read/write upgrades of file systems that
+               // had the TYPENAME_OVERRIDE feature set.
+               if (mp->mnt_kern_flag & MNTK_TYPENAME_OVERRIDE) {
+                       error = EPERM;
+                       goto out1;
+               }
                mp->mnt_kern_flag |= MNTK_WANTRDWR;
+       }
        mp->mnt_flag &= ~(MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
                          MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC |
-                         MNT_UNKNOWNPERMISSIONS | MNT_DONTBROWSE | MNT_AUTOMOUNTED);
-       mp->mnt_flag |= uap->flags & (MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
-                                     MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC |
-                                     MNT_UNKNOWNPERMISSIONS | MNT_DONTBROWSE | MNT_AUTOMOUNTED | 
-                                         MNT_DEFWRITE);
+                         MNT_UNKNOWNPERMISSIONS | MNT_DONTBROWSE |
+                         MNT_AUTOMOUNTED | MNT_DEFWRITE | MNT_NOATIME |
+                         MNT_QUARANTINE | MNT_CPROTECT);
 
-       if (vfsp->vfc_vfsflags & VFC_VFSLOCALARGS) {
-               if (is_64bit) {
+#if SECURE_KERNEL
+#if !CONFIG_MNT_SUID
+       /*
+        * On release builds of iOS based platforms, always enforce NOSUID on
+        * all mounts. We do this here because we can catch update mounts as well as
+        * non-update mounts in this case.
+        */
+       mp->mnt_flag |= (MNT_NOSUID);
+#endif
+#endif
+
+       mp->mnt_flag |= flags & (MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
+                                MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC |
+                                MNT_UNKNOWNPERMISSIONS | MNT_DONTBROWSE |
+                                MNT_AUTOMOUNTED | MNT_DEFWRITE | MNT_NOATIME |
+                                MNT_QUARANTINE | MNT_CPROTECT);
+
+#if CONFIG_MACF
+       if (flags & MNT_MULTILABEL) {
+               if (vfsp->vfc_vfsflags & VFC_VFSNOMACLABEL) {
+                       error = EINVAL;
+                       goto out1;
+               }
+               mp->mnt_flag |= MNT_MULTILABEL;
+       }
+#endif
+       /*
+        * Process device path for local file systems if requested
+        */
+       if (vfsp->vfc_vfsflags & VFC_VFSLOCALARGS &&
+           !(internal_flags & KERNEL_MOUNT_SNAPSHOT)) {
+               if (vfs_context_is64bit(ctx)) {
                        if ( (error = copyin(fsmountargs, (caddr_t)&devpath, sizeof(devpath))) )
-                               goto out1;      
+                               goto out1;
                        fsmountargs += sizeof(devpath);
                } else {
-                       char *tmp;
+                       user32_addr_t tmp;
                        if ( (error = copyin(fsmountargs, (caddr_t)&tmp, sizeof(tmp))) )
-                               goto out1;      
+                               goto out1;
                        /* munge into LP64 addr */
                        devpath = CAST_USER_ADDR_T(tmp);
                        fsmountargs += sizeof(tmp);
                }
 
-               /* if it is not update and device name needs to be parsed */
+               /* Lookup device and authorize access to it */
                if ((devpath)) {
-                       NDINIT(&nd1, LOOKUP, FOLLOW, UIO_USERSPACE, devpath, &context);
-                       if ( (error = namei(&nd1)) )
+                       struct nameidata nd;
+
+                       NDINIT(&nd, LOOKUP, OP_MOUNT, FOLLOW, UIO_USERSPACE, devpath, ctx);
+                       if ( (error = namei(&nd)) )
                                goto out1;
 
-                       strncpy(mp->mnt_vfsstat.f_mntfromname, nd1.ni_cnd.cn_pnbuf, MAXPATHLEN);
-                       devvp = nd1.ni_vp;
+                       strlcpy(mp->mnt_vfsstat.f_mntfromname, nd.ni_cnd.cn_pnbuf, MAXPATHLEN);
+                       devvp = nd.ni_vp;
 
-                       nameidone(&nd1);
+                       nameidone(&nd);
 
                        if (devvp->v_type != VBLK) {
                                error = ENOTBLK;
@@ -401,15 +871,17 @@ update:
                        * If mount by non-root, then verify that user has necessary
                        * permissions on the device.
                        */
-                       if (suser(context.vc_ucred, NULL) != 0) {
-                               accessmode = KAUTH_VNODE_READ_DATA;
+                       if (suser(vfs_context_ucred(ctx), NULL) != 0) {
+                               mode_t accessmode = KAUTH_VNODE_READ_DATA;
+
                                if ((mp->mnt_flag & MNT_RDONLY) == 0)
                                        accessmode |= KAUTH_VNODE_WRITE_DATA;
-                               if ((error = vnode_authorize(devvp, NULL, accessmode, &context)) != 0)
+                               if ((error = vnode_authorize(devvp, NULL, accessmode, ctx)) != 0)
                                        goto out2;
                        }
                }
-               if (devpath && ((uap->flags & MNT_UPDATE) == 0)) {
+               /* On first mount, preflight and open device */
+               if (devpath && ((flags & MNT_UPDATE) == 0)) {
                        if ( (error = vnode_ref(devvp)) )
                                goto out2;
                        /*
@@ -420,12 +892,12 @@ update:
                        */
                        if ( (error = vfs_mountedon(devvp)) )
                                goto out3;
-       
+
                        if (vcount(devvp) > 1 && !(vfs_flags(mp) & MNT_ROOTFS)) {
                                error = EBUSY;
                                goto out3;
                        }
-                       if ( (error = VNOP_FSYNC(devvp, MNT_WAIT, &context)) ) {
+                       if ( (error = VNOP_FSYNC(devvp, MNT_WAIT, ctx)) ) {
                                error = ENOTBLK;
                                goto out3;
                        }
@@ -433,73 +905,201 @@ update:
                                goto out3;
 
                        ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
-                       if ( (error = VNOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, &context)) )
+#if CONFIG_MACF
+                       error = mac_vnode_check_open(ctx,
+                           devvp,
+                           ronly ? FREAD : FREAD|FWRITE);
+                       if (error)
+                               goto out3;
+#endif /* MAC */
+                       if ( (error = VNOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, ctx)) )
                                goto out3;
 
                        mp->mnt_devvp = devvp;
                        device_vnode = devvp;
-               } else {
-                       if ((mp->mnt_flag & MNT_RDONLY) && (mp->mnt_kern_flag & MNTK_WANTRDWR)) {
-                               /*
-                                * If upgrade to read-write by non-root, then verify
-                                * that user has necessary permissions on the device.
-                                */
-                               device_vnode = mp->mnt_devvp;
-                               if (device_vnode && suser(context.vc_ucred, NULL)) {
-                                       if ((error = vnode_authorize(device_vnode, NULL,
-                                                KAUTH_VNODE_READ_DATA | KAUTH_VNODE_WRITE_DATA, &context)) != 0)
-                                               goto out2;
-                               }
+
+               } else if ((mp->mnt_flag & MNT_RDONLY) &&
+                          (mp->mnt_kern_flag & MNTK_WANTRDWR) &&
+                          (device_vnode = mp->mnt_devvp)) {
+                       dev_t dev;
+                       int maj;
+                       /*
+                        * If upgrade to read-write by non-root, then verify
+                        * that user has necessary permissions on the device.
+                        */
+                       vnode_getalways(device_vnode);
+
+                       if (suser(vfs_context_ucred(ctx), NULL) &&
+                           (error = vnode_authorize(device_vnode, NULL,
+                            KAUTH_VNODE_READ_DATA | KAUTH_VNODE_WRITE_DATA,
+                            ctx)) != 0) {
+                               vnode_put(device_vnode);
+                               goto out2;
                        }
+
+                       /* Tell the device that we're upgrading */
+                       dev = (dev_t)device_vnode->v_rdev;
+                       maj = major(dev);
+
+                       if ((u_int)maj >= (u_int)nblkdev)
+                               panic("Volume mounted on a device with invalid major number.");
+
+                       error = bdevsw[maj].d_open(dev, FREAD | FWRITE, S_IFBLK, p);
+                       vnode_put(device_vnode);
                        device_vnode = NULLVP;
+                       if (error != 0) {
+                               goto out2;
+                       }
                }
        }
-
-
+#if CONFIG_MACF
+       if ((flags & MNT_UPDATE) == 0) {
+               mac_mount_label_init(mp);
+               mac_mount_label_associate(ctx, mp);
+       }
+       if (labelstr) {
+               if ((flags & MNT_UPDATE) != 0) {
+                       error = mac_mount_check_label_update(ctx, mp);
+                       if (error != 0)
+                               goto out3;
+               }
+       }
+#endif
        /*
         * Mount the filesystem.
         */
-       error = VFS_MOUNT(mp, device_vnode, fsmountargs, &context);
+       if (internal_flags & KERNEL_MOUNT_SNAPSHOT) {
+               error = VFS_IOCTL(mp, VFSIOC_MOUNT_SNAPSHOT,
+                   (caddr_t)fsmountargs, 0, ctx);
+       } else {
+               error = VFS_MOUNT(mp, device_vnode, fsmountargs, ctx);
+       }
 
-       if (uap->flags & MNT_UPDATE) {
+       if (flags & MNT_UPDATE) {
                if (mp->mnt_kern_flag & MNTK_WANTRDWR)
                        mp->mnt_flag &= ~MNT_RDONLY;
                mp->mnt_flag &=~
                    (MNT_UPDATE | MNT_RELOAD | MNT_FORCE);
                mp->mnt_kern_flag &=~ MNTK_WANTRDWR;
                if (error)
-                       mp->mnt_flag = flag;
+                       mp->mnt_flag = flag;  /* restore flag value */
                vfs_event_signal(NULL, VQ_UPDATE, (intptr_t)NULL);
                lck_rw_done(&mp->mnt_rwlock);
+               is_rwlock_locked = FALSE;
                if (!error)
-                       enablequotas(mp,&context);
-               goto out2;
+                       enablequotas(mp, ctx);
+               goto exit;
        }
+
        /*
         * Put the new filesystem on the mount list after root.
         */
-       if (!error) {
-               CLR(vp->v_flag, VMOUNT);
+       if (error == 0) {
+               struct vfs_attr vfsattr;
+#if CONFIG_MACF
+               if (vfs_flags(mp) & MNT_MULTILABEL) {
+                       error = VFS_ROOT(mp, &rvp, ctx);
+                       if (error) {
+                               printf("%s() VFS_ROOT returned %d\n", __func__, error);
+                               goto out3;
+                       }
+                       error = vnode_label(mp, NULL, rvp, NULL, 0, ctx);
+                        /*
+                        * drop reference provided by VFS_ROOT
+                        */
+                       vnode_put(rvp);
+
+                       if (error)
+                               goto out3;
+               }
+#endif /* MAC */
 
-               vnode_lock(vp);
+               vnode_lock_spin(vp);
+               CLR(vp->v_flag, VMOUNT);
                vp->v_mountedhere = mp;
                vnode_unlock(vp);
 
-               vnode_ref(vp);
+               /*
+                * taking the name_cache_lock exclusively will
+                * insure that everyone is out of the fast path who
+                * might be trying to use a now stale copy of
+                * vp->v_mountedhere->mnt_realrootvp
+                * bumping mount_generation causes the cached values
+                * to be invalidated
+                */
+               name_cache_lock();
+               mount_generation++;
+               name_cache_unlock();
+
+               error = vnode_ref(vp);
+               if (error != 0) {
+                       goto out4;
+               }
 
-               vfs_event_signal(NULL, VQ_MOUNT, (intptr_t)NULL);
-               checkdirs(vp, &context);
-               lck_rw_done(&mp->mnt_rwlock);
-               mount_list_add(mp);
-               /* 
-                * there is no cleanup code here so I have made it void 
+               have_usecount = TRUE;
+
+               error = checkdirs(vp, ctx);
+               if (error != 0)  {
+                       /* Unmount the filesystem as cdir/rdirs cannot be updated */
+                       goto out4;
+               }
+               /*
+                * there is no cleanup code here so I have made it void
                 * we need to revisit this
                 */
-               (void)VFS_START(mp, 0, &context);
+               (void)VFS_START(mp, 0, ctx);
+
+               if (mount_list_add(mp) != 0) {
+                       /*
+                        * The system is shutting down trying to umount
+                        * everything, so fail with a plausible errno.
+                        */
+                       error = EBUSY;
+                       goto out4;
+               }
+               lck_rw_done(&mp->mnt_rwlock);
+               is_rwlock_locked = FALSE;
+
+               /* Check if this mounted file system supports EAs or named streams. */
+               /* Skip WebDAV file systems for now since they hang in VFS_GETATTR here. */
+               VFSATTR_INIT(&vfsattr);
+               VFSATTR_WANTED(&vfsattr, f_capabilities);
+               if (strncmp(mp->mnt_vfsstat.f_fstypename, "webdav", sizeof("webdav")) != 0 &&
+                   vfs_getattr(mp, &vfsattr, ctx) == 0 &&
+                   VFSATTR_IS_SUPPORTED(&vfsattr, f_capabilities)) {
+                       if ((vfsattr.f_capabilities.capabilities[VOL_CAPABILITIES_INTERFACES] & VOL_CAP_INT_EXTENDED_ATTR) &&
+                           (vfsattr.f_capabilities.valid[VOL_CAPABILITIES_INTERFACES] & VOL_CAP_INT_EXTENDED_ATTR)) {
+                               mp->mnt_kern_flag |= MNTK_EXTENDED_ATTRS;
+                       }
+#if NAMEDSTREAMS
+                       if ((vfsattr.f_capabilities.capabilities[VOL_CAPABILITIES_INTERFACES] & VOL_CAP_INT_NAMEDSTREAMS) &&
+                           (vfsattr.f_capabilities.valid[VOL_CAPABILITIES_INTERFACES] & VOL_CAP_INT_NAMEDSTREAMS)) {
+                               mp->mnt_kern_flag |= MNTK_NAMED_STREAMS;
+                       }
+#endif
+                       /* Check if this file system supports path from id lookups. */
+                       if ((vfsattr.f_capabilities.capabilities[VOL_CAPABILITIES_FORMAT] & VOL_CAP_FMT_PATH_FROM_ID) &&
+                           (vfsattr.f_capabilities.valid[VOL_CAPABILITIES_FORMAT] & VOL_CAP_FMT_PATH_FROM_ID)) {
+                               mp->mnt_kern_flag |= MNTK_PATH_FROM_ID;
+                       } else if (mp->mnt_flag & MNT_DOVOLFS) {
+                               /* Legacy MNT_DOVOLFS flag also implies path from id lookups. */
+                               mp->mnt_kern_flag |= MNTK_PATH_FROM_ID;
+                       }
 
+                       if ((vfsattr.f_capabilities.capabilities[VOL_CAPABILITIES_FORMAT] & VOL_CAP_FMT_DIR_HARDLINKS) &&
+                               (vfsattr.f_capabilities.valid[VOL_CAPABILITIES_FORMAT] & VOL_CAP_FMT_DIR_HARDLINKS)) {
+                               mp->mnt_kern_flag |= MNTK_DIR_HARDLINKS;
+                       }
+               }
+               if (mp->mnt_vtable->vfc_vfsflags & VFC_VFSNATIVEXATTR) {
+                       mp->mnt_kern_flag |= MNTK_EXTENDED_ATTRS;
+               }
+               if (mp->mnt_vtable->vfc_vfsflags & VFC_VFSPREFLIGHT) {
+                       mp->mnt_kern_flag |= MNTK_UNMOUNT_PREFLIGHT;
+               }
                /* increment the operations count */
-               OSAddAtomic(1, (SInt32 *)&vfs_nummntops);
-               enablequotas(mp,&context);
+               OSAddAtomic(1, &vfs_nummntops);
+               enablequotas(mp, ctx);
 
                if (device_vnode) {
                        device_vnode->v_specflags |= SI_MOUNTEDON;
@@ -511,4948 +1111,11009 @@ update:
                         *   defaults will have been set, so no reason to bail or care
                         */
                        vfs_init_io_attributes(device_vnode, mp);
-               } 
+               }
+
+               /* Now that mount is setup, notify the listeners */
+               vfs_notify_mount(pvp);
+               IOBSDMountChange(mp, kIOMountChangeMount);
+
        } else {
+               /* If we fail a fresh mount, there should be no vnodes left hooked into the mountpoint. */
+               if (mp->mnt_vnodelist.tqh_first != NULL) {
+                       panic("mount_common(): mount of %s filesystem failed with %d, but vnode list is not empty.",
+                                       mp->mnt_vtable->vfc_name, error);
+               }
+
+               vnode_lock_spin(vp);
                CLR(vp->v_flag, VMOUNT);
+               vnode_unlock(vp);
                mount_list_lock();
                mp->mnt_vtable->vfc_refcount--;
                mount_list_unlock();
 
                if (device_vnode ) {
-                       VNOP_CLOSE(device_vnode, ronly ? FREAD : FREAD|FWRITE, &context);
                        vnode_rele(device_vnode);
+                       VNOP_CLOSE(device_vnode, ronly ? FREAD : FREAD|FWRITE, ctx);
                }
                lck_rw_done(&mp->mnt_rwlock);
+               is_rwlock_locked = FALSE;
+
+               /*
+                * if we get here, we have a mount structure that needs to be freed,
+                * but since the coveredvp hasn't yet been updated to point at it,
+                * no need to worry about other threads holding a crossref on this mp
+                * so it's ok to just free it
+                */
                mount_lock_destroy(mp);
+#if CONFIG_MACF
+               mac_mount_label_destroy(mp);
+#endif
                FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
        }
-       nameidone(&nd);
-
+exit:
        /*
-        * drop I/O count on covered 'vp' and
-        * on the device vp if there was one
+        * drop I/O count on the device vp if there was one
         */
        if (devpath && devvp)
                vnode_put(devvp);
-       vnode_put(vp);
-
-       return(error);
-
-out3:
-       vnode_rele(devvp);
-out2:
-       if (devpath && devvp)
-               vnode_put(devvp);
-out1:
-       if (mntalloc)
-               FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
-       vnode_put(vp);
-       nameidone(&nd);
 
        return(error);
 
-}
-
-void
-enablequotas(struct mount *mp, vfs_context_t context)
-{
-       struct nameidata qnd;
-       int type;
-       char qfpath[MAXPATHLEN];
-       const char *qfname = QUOTAFILENAME;
-       const char *qfopsname = QUOTAOPSNAME;
-       const char *qfextension[] = INITQFNAMES;
-
-       if ((strcmp(mp->mnt_vfsstat.f_fstypename, "hfs") != 0 )
-                && (strcmp( mp->mnt_vfsstat.f_fstypename, "ufs") != 0))
-         return;
+/* Error condition exits */
+out4:
+       (void)VFS_UNMOUNT(mp, MNT_FORCE, ctx);
 
-       /* 
-        * Enable filesystem disk quotas if necessary.
-        * We ignore errors as this should not interfere with final mount
+       /*
+        * If the mount has been placed on the covered vp,
+        * it may have been discovered by now, so we have
+        * to treat this just like an unmount
         */
-       for (type=0; type < MAXQUOTAS; type++) {
-               sprintf(qfpath, "%s/%s.%s", mp->mnt_vfsstat.f_mntonname, qfopsname, qfextension[type]);
-               NDINIT(&qnd, LOOKUP, FOLLOW, UIO_SYSSPACE32, CAST_USER_ADDR_T(qfpath), context);
-               if (namei(&qnd) != 0)
-                       continue;           /* option file to trigger quotas is not present */
-               vnode_put(qnd.ni_vp);
-               nameidone(&qnd);
-               sprintf(qfpath, "%s/%s.%s", mp->mnt_vfsstat.f_mntonname, qfname, qfextension[type]);
+       mount_lock_spin(mp);
+       mp->mnt_lflag |= MNT_LDEAD;
+       mount_unlock(mp);
 
-               (void) VFS_QUOTACTL(mp, QCMD(Q_QUOTAON, type), 0, qfpath, context);
+       if (device_vnode != NULLVP) {
+               vnode_rele(device_vnode);
+               VNOP_CLOSE(device_vnode, mp->mnt_flag & MNT_RDONLY ? FREAD : FREAD|FWRITE,
+                       ctx);
+               did_rele = TRUE;
        }
-       return;
-}
 
-/*
- * Scan all active processes to see if any of them have a current
- * or root directory onto which the new filesystem has just been
- * mounted. If so, replace them with the new mount point.
- */
-static void
-checkdirs(olddp, context)
-       struct vnode *olddp;
-       vfs_context_t context;
-{
-       struct filedesc *fdp;
-       struct vnode *newdp;
-       struct proc *p;
-       struct vnode *tvp;
-       struct vnode *fdp_cvp;
-       struct vnode *fdp_rvp;
-       int cdir_changed = 0;
-       int rdir_changed = 0;
-       boolean_t funnel_state;
+       vnode_lock_spin(vp);
 
-       if (olddp->v_usecount == 1)
-               return;
-       if (VFS_ROOT(olddp->v_mountedhere, &newdp, context))
-               panic("mount: lost mount");
-       funnel_state = thread_funnel_set(kernel_flock, TRUE);
+       mp->mnt_crossref++;
+       vp->v_mountedhere = (mount_t) 0;
 
-       for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
-               proc_fdlock(p);
-               fdp = p->p_fd;
-               if (fdp == (struct filedesc *)0) {
-                       proc_fdunlock(p);
-                       continue;
-               }
-               fdp_cvp = fdp->fd_cdir;
-               fdp_rvp = fdp->fd_rdir;
-               proc_fdunlock(p);
+       vnode_unlock(vp);
 
-               if (fdp_cvp == olddp) {
-                       vnode_ref(newdp);
-                       tvp = fdp->fd_cdir;
-                       fdp_cvp = newdp;
-                       cdir_changed = 1;
-                       vnode_rele(tvp);
-               }
-               if (fdp_rvp == olddp) {
-                       vnode_ref(newdp);
-                       tvp = fdp->fd_rdir;
-                       fdp_rvp = newdp;
-                       rdir_changed = 1;
-                       vnode_rele(tvp);
-               }
-               if (cdir_changed || rdir_changed) {
-                       proc_fdlock(p);
-                       fdp->fd_cdir = fdp_cvp;
-                       fdp->fd_rdir = fdp_rvp;
-                       proc_fdunlock(p);
+       if (have_usecount) {
+               vnode_rele(vp);
+       }
+out3:
+       if (devpath && ((flags & MNT_UPDATE) == 0) && (!did_rele))
+               vnode_rele(devvp);
+out2:
+       if (devpath && devvp)
+               vnode_put(devvp);
+out1:
+       /* Release mnt_rwlock only when it was taken */
+       if (is_rwlock_locked == TRUE) {
+               lck_rw_done(&mp->mnt_rwlock);
+       }
+
+       if (mntalloc) {
+               if (mp->mnt_crossref)
+                       mount_dropcrossref(mp, vp, 0);
+               else {
+                       mount_lock_destroy(mp);
+#if CONFIG_MACF
+                       mac_mount_label_destroy(mp);
+#endif
+                       FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
                }
        }
-       if (rootvnode == olddp) {
-               vnode_ref(newdp);
-               tvp = rootvnode;
-               rootvnode = newdp;
-               vnode_rele(tvp);
+       if (vfsp_ref) {
+               mount_list_lock();
+               vfsp->vfc_refcount--;
+               mount_list_unlock();
        }
-       thread_funnel_set(kernel_flock, funnel_state);
 
-       vnode_put(newdp);
+       return(error);
 }
 
 /*
- * Unmount a file system.
- *
- * Note: unmount takes a path to the vnode mounted on as argument,
- * not special file (as before).
+ * Flush in-core data, check for competing mount attempts,
+ * and set VMOUNT
  */
-/* ARGSUSED */
 int
-unmount(struct proc *p, register struct unmount_args *uap, __unused register_t *retval)
+prepare_coveredvp(vnode_t vp, vfs_context_t ctx, struct componentname *cnp, const char *fsname, boolean_t skip_auth)
 {
-       register struct vnode *vp;
-       struct mount *mp;
+#if !CONFIG_MACF
+#pragma unused(cnp,fsname)
+#endif
+       struct vnode_attr va;
        int error;
-       struct nameidata nd;
-       struct vfs_context context;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       if (!skip_auth) {
+               /*
+                * If the user is not root, ensure that they own the directory
+                * onto which we are attempting to mount.
+                */
+               VATTR_INIT(&va);
+               VATTR_WANTED(&va, va_uid);
+               if ((error = vnode_getattr(vp, &va, ctx)) ||
+                               (va.va_uid != kauth_cred_getuid(vfs_context_ucred(ctx)) &&
+                                (!vfs_context_issuser(ctx)))) {
+                       error = EPERM;
+                       goto out;
+               }
+       }
 
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               return (error);
-       vp = nd.ni_vp;
-       mp = vp->v_mount;
-       nameidone(&nd);
+       if ( (error = VNOP_FSYNC(vp, MNT_WAIT, ctx)) )
+               goto out;
 
-       /*
-        * Must be the root of the filesystem
-        */
-       if ((vp->v_flag & VROOT) == 0) {
-               vnode_put(vp);
-               return (EINVAL);
+       if ( (error = buf_invalidateblks(vp, BUF_WRITE_DATA, 0, 0)) )
+               goto out;
+
+       if (vp->v_type != VDIR) {
+               error = ENOTDIR;
+               goto out;
        }
-       vnode_put(vp);
-       return (safedounmount(mp, uap->flags, p));
-}
 
-/*
- * Do the actual file system unmount, prevent some common foot shooting.
- *
- * XXX Should take a "vfs_context_t" instead of a "struct proc *"
- */
-int
-safedounmount(mp, flags, p)
-       struct mount *mp;
-       int flags;
-       struct proc *p;
-{
-       int error;
+       if (ISSET(vp->v_flag, VMOUNT) && (vp->v_mountedhere != NULL)) {
+               error = EBUSY;
+               goto out;
+       }
 
-       /*
-        * Only root, or the user that did the original mount is
-        * permitted to unmount this filesystem.
-        */
-       if ((mp->mnt_vfsstat.f_owner != kauth_cred_getuid(kauth_cred_get())) &&
-           (error = suser(kauth_cred_get(), &p->p_acflag)))
-               return (error);
+#if CONFIG_MACF
+       error = mac_mount_check_mount(ctx, vp,
+           cnp, fsname);
+       if (error != 0)
+               goto out;
+#endif
 
-       /*
-        * Don't allow unmounting the root file system.
-        */
-       if (mp->mnt_flag & MNT_ROOTFS)
-               return (EBUSY); /* the root is always busy */
+       vnode_lock_spin(vp);
+       SET(vp->v_flag, VMOUNT);
+       vnode_unlock(vp);
 
-       return (dounmount(mp, flags, p));
+out:
+       return error;
 }
 
-/*
- * Do the actual file system unmount.
- */
-int
-dounmount(mp, flags, p)
-       register struct mount *mp;
-       int flags;
-       struct proc *p;
+#if CONFIG_IMGSRC_ACCESS
+
+#if DEBUG
+#define IMGSRC_DEBUG(args...) printf(args)
+#else
+#define IMGSRC_DEBUG(args...) do { } while(0)
+#endif
+
+static int
+authorize_devpath_and_update_mntfromname(mount_t mp, user_addr_t devpath, vnode_t *devvpp, vfs_context_t ctx)
 {
-       struct vnode *coveredvp = (vnode_t)0;
+       struct nameidata nd;
+       vnode_t vp, realdevvp;
+       mode_t accessmode;
        int error;
-       int needwakeup = 0;
-       struct vfs_context context;
-       int forcedunmount = 0;
-       int lflags = 0;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       if (flags & MNT_FORCE)
-               forcedunmount = 1;
-       mount_lock(mp);
-       /* XXX post jaguar fix LK_DRAIN - then clean this up */
-       if ((flags & MNT_FORCE)) {
-               mp->mnt_kern_flag |= MNTK_FRCUNMOUNT;
-               mp->mnt_lflag |= MNT_LFORCE;
-       }
-       if (mp->mnt_lflag & MNT_LUNMOUNT) {
-               mp->mnt_lflag |= MNT_LWAIT;
-               msleep((caddr_t)mp, &mp->mnt_mlock, (PVFS | PDROP), "dounmount", 0 );
-               /*
-                * The prior unmount attempt has probably succeeded.
-                * Do not dereference mp here - returning EBUSY is safest.
-                */
-               return (EBUSY);
-       }
-       mp->mnt_kern_flag |= MNTK_UNMOUNT;
-       mp->mnt_lflag |= MNT_LUNMOUNT;
-       mp->mnt_flag &=~ MNT_ASYNC;
-       mount_unlock(mp);
-       lck_rw_lock_exclusive(&mp->mnt_rwlock);
-       fsevent_unmount(mp);  /* has to come first! */
-       error = 0;
-       if (forcedunmount == 0) {
-               ubc_umount(mp); /* release cached vnodes */
-               if ((mp->mnt_flag & MNT_RDONLY) == 0) {
-                       error = VFS_SYNC(mp, MNT_WAIT, &context);
-                       if (error) {
-                               mount_lock(mp);
-                               mp->mnt_kern_flag &= ~MNTK_UNMOUNT;
-                               mp->mnt_lflag &= ~MNT_LUNMOUNT;
-                               mp->mnt_lflag &= ~MNT_LFORCE;
-                               goto out;
-                       }
-               }
+       NDINIT(&nd, LOOKUP, OP_LOOKUP, FOLLOW, UIO_USERSPACE, devpath, ctx);
+       if ( (error = namei(&nd)) ) {
+               IMGSRC_DEBUG("namei() failed with %d\n", error);
+               return error;
        }
-       
-       if (forcedunmount)
-               lflags |= FORCECLOSE;
-       error = vflush(mp, NULLVP, SKIPSWAP | SKIPSYSTEM  | SKIPROOT | lflags);
-       if ((forcedunmount == 0) && error) {
-               mount_lock(mp);
-               mp->mnt_kern_flag &= ~MNTK_UNMOUNT;
-               mp->mnt_lflag &= ~MNT_LUNMOUNT;
-               mp->mnt_lflag &= ~MNT_LFORCE;
+
+       vp = nd.ni_vp;
+
+       if (!vnode_isblk(vp)) {
+               IMGSRC_DEBUG("Not block device.\n");
+               error = ENOTBLK;
                goto out;
        }
 
-       /* make sure there are no one in the mount iterations or lookup */
-       mount_iterdrain(mp);
+       realdevvp = mp->mnt_devvp;
+       if (realdevvp == NULLVP) {
+               IMGSRC_DEBUG("No device backs the mount.\n");
+               error = ENXIO;
+               goto out;
+       }
 
-       error = VFS_UNMOUNT(mp, flags, &context);
-       if (error) {
-               mount_iterreset(mp);
-               mount_lock(mp);
-               mp->mnt_kern_flag &= ~MNTK_UNMOUNT;
-               mp->mnt_lflag &= ~MNT_LUNMOUNT;
-               mp->mnt_lflag &= ~MNT_LFORCE;
+       error = vnode_getwithref(realdevvp);
+       if (error != 0) {
+               IMGSRC_DEBUG("Coudn't get iocount on device.\n");
                goto out;
        }
 
-       /* increment the operations count */
-       if (!error)
-               OSAddAtomic(1, (SInt32 *)&vfs_nummntops);
+       if (vnode_specrdev(vp) != vnode_specrdev(realdevvp)) {
+               IMGSRC_DEBUG("Wrong dev_t.\n");
+               error = ENXIO;
+               goto out1;
+       }
 
-       if ( mp->mnt_devvp && mp->mnt_vtable->vfc_vfsflags & VFC_VFSLOCALARGS) {
-               mp->mnt_devvp->v_specflags &= ~SI_MOUNTEDON;
-               VNOP_CLOSE(mp->mnt_devvp, mp->mnt_flag & MNT_RDONLY ? FREAD : FREAD|FWRITE,
-                       &context);
-               vnode_rele(mp->mnt_devvp);
+       strlcpy(mp->mnt_vfsstat.f_mntfromname, nd.ni_cnd.cn_pnbuf, MAXPATHLEN);
+
+       /*
+        * If mount by non-root, then verify that user has necessary
+        * permissions on the device.
+        */
+       if (!vfs_context_issuser(ctx)) {
+               accessmode = KAUTH_VNODE_READ_DATA;
+               if ((mp->mnt_flag & MNT_RDONLY) == 0)
+                       accessmode |= KAUTH_VNODE_WRITE_DATA;
+               if ((error = vnode_authorize(vp, NULL, accessmode, ctx)) != 0) {
+                       IMGSRC_DEBUG("Access denied.\n");
+                       goto out1;
+               }
        }
-       lck_rw_done(&mp->mnt_rwlock);
-       mount_list_remove(mp);
-       lck_rw_lock_exclusive(&mp->mnt_rwlock);
-       
-       /* mark the mount point hook in the vp but not drop the ref yet */
-       if ((coveredvp = mp->mnt_vnodecovered) != NULLVP) {
-                       vnode_getwithref(coveredvp);
-                       vnode_lock(coveredvp);
-                       coveredvp->v_mountedhere = (struct mount *)0;
-                       vnode_unlock(coveredvp);
-                       vnode_put(coveredvp);
+
+       *devvpp = vp;
+
+out1:
+       vnode_put(realdevvp);
+out:
+       nameidone(&nd);
+       if (error) {
+               vnode_put(vp);
        }
 
-       mount_list_lock();
-       mp->mnt_vtable->vfc_refcount--;
-       mount_list_unlock();
+       return error;
+}
 
-       cache_purgevfs(mp);     /* remove cache entries for this file sys */
-       vfs_event_signal(NULL, VQ_UNMOUNT, (intptr_t)NULL);
-       mount_lock(mp);
-       mp->mnt_lflag |= MNT_LDEAD;
+/*
+ * Clear VMOUNT, set v_mountedhere, and mnt_vnodecovered, ref the vnode,
+ * and call checkdirs()
+ */
+static int
+place_mount_and_checkdirs(mount_t mp, vnode_t vp, vfs_context_t ctx)
+{
+       int error;
 
-       if (mp->mnt_lflag & MNT_LWAIT) {
-               /*
-                * do the wakeup here
-                * in case we block in mount_refdrain
-                * which will drop the mount lock
-                * and allow anyone blocked in vfs_busy
-                * to wakeup and see the LDEAD state
-                */
-               mp->mnt_lflag &= ~MNT_LWAIT;
-               wakeup((caddr_t)mp);
+       mp->mnt_vnodecovered = vp; /* XXX This is normally only set at init-time ... */
+
+       vnode_lock_spin(vp);
+       CLR(vp->v_flag, VMOUNT);
+       vp->v_mountedhere = mp;
+       vnode_unlock(vp);
+
+       /*
+        * taking the name_cache_lock exclusively will
+        * insure that everyone is out of the fast path who
+        * might be trying to use a now stale copy of
+        * vp->v_mountedhere->mnt_realrootvp
+        * bumping mount_generation causes the cached values
+        * to be invalidated
+        */
+       name_cache_lock();
+       mount_generation++;
+       name_cache_unlock();
+
+       error = vnode_ref(vp);
+       if (error != 0) {
+               goto out;
        }
-       mount_refdrain(mp);
-out:
-       if (mp->mnt_lflag & MNT_LWAIT) {
-               mp->mnt_lflag &= ~MNT_LWAIT;
-               needwakeup = 1; 
+
+       error = checkdirs(vp, ctx);
+       if (error != 0)  {
+               /* Unmount the filesystem as cdir/rdirs cannot be updated */
+               vnode_rele(vp);
+               goto out;
        }
-       mount_unlock(mp);
-       lck_rw_done(&mp->mnt_rwlock);
 
-       if (needwakeup)
-               wakeup((caddr_t)mp);
-       if (!error) {
-               if ((coveredvp != NULLVP)) {
-                       vnode_getwithref(coveredvp);
-                       vnode_rele(coveredvp);
-                       vnode_lock(coveredvp);
-                       if(mp->mnt_crossref == 0) {
-                               vnode_unlock(coveredvp);
-                               mount_lock_destroy(mp);
-                               FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
-                       }  else {
-                               coveredvp->v_lflag |= VL_MOUNTDEAD;
-                               vnode_unlock(coveredvp);
-                       }
-                       vnode_put(coveredvp);
-               } else if (mp->mnt_flag & MNT_ROOTFS) {
-                               mount_lock_destroy(mp);
-                               FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
-               } else
-                       panic("dounmount: no coveredvp");
+out:
+       if (error != 0) {
+               mp->mnt_vnodecovered = NULLVP;
        }
-       return (error);
+       return error;
 }
 
-void
-mount_dropcrossref(mount_t mp, vnode_t dp, int need_put)
+static void
+undo_place_on_covered_vp(mount_t mp, vnode_t vp)
 {
-               vnode_lock(dp);
-               mp->mnt_crossref--;
-               if (mp->mnt_crossref < 0)
-                       panic("mount cross refs -ve");
-               if (((dp->v_lflag & VL_MOUNTDEAD) == VL_MOUNTDEAD) && (mp->mnt_crossref == 0)) {
-                       dp->v_lflag &= ~VL_MOUNTDEAD;
-                       if (need_put)
-                               vnode_put_locked(dp);
-                       vnode_unlock(dp);
-                       mount_lock_destroy(mp);
-                       FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
-                       return;
-               }
-               if (need_put)
-                       vnode_put_locked(dp);
-               vnode_unlock(dp);
-}
+       vnode_rele(vp);
+       vnode_lock_spin(vp);
+       vp->v_mountedhere = (mount_t)NULL;
+       vnode_unlock(vp);
 
+       mp->mnt_vnodecovered = NULLVP;
+}
 
-/*
- * Sync each mounted filesystem.
- */
-#if DIAGNOSTIC
-int syncprt = 0;
-struct ctldebug debug0 = { "syncprt", &syncprt };
-#endif
+static int
+mount_begin_update(mount_t mp, vfs_context_t ctx, int flags)
+{
+       int error;
 
-int print_vmpage_stat=0;
+       /* unmount in progress return error */
+       mount_lock_spin(mp);
+       if (mp->mnt_lflag & MNT_LUNMOUNT) {
+               mount_unlock(mp);
+               return EBUSY;
+       }
+       mount_unlock(mp);
+       lck_rw_lock_exclusive(&mp->mnt_rwlock);
 
-static int 
-sync_callback(mount_t mp, __unused void * arg)
-{
-       struct proc * p = current_proc();
-       int asyncflag;
-       struct vfs_context context;
+       /*
+        * We only allow the filesystem to be reloaded if it
+        * is currently mounted read-only.
+        */
+       if ((flags & MNT_RELOAD) &&
+                       ((mp->mnt_flag & MNT_RDONLY) == 0)) {
+               error = ENOTSUP;
+               goto out;
+       }
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       /*
+        * Only root, or the user that did the original mount is
+        * permitted to update it.
+        */
+       if (mp->mnt_vfsstat.f_owner != kauth_cred_getuid(vfs_context_ucred(ctx)) &&
+                       (!vfs_context_issuser(ctx))) {
+               error = EPERM;
+               goto out;
+       }
+#if CONFIG_MACF
+       error = mac_mount_check_remount(ctx, mp);
+       if (error != 0) {
+               goto out;
+       }
+#endif
 
-       if ((mp->mnt_flag & MNT_RDONLY) == 0) {
-                       asyncflag = mp->mnt_flag & MNT_ASYNC;
-                       mp->mnt_flag &= ~MNT_ASYNC;
-                       VFS_SYNC(mp, MNT_NOWAIT, &context);
-                       if (asyncflag)
-                               mp->mnt_flag |= MNT_ASYNC;
+out:
+       if (error) {
+               lck_rw_done(&mp->mnt_rwlock);
        }
-       return(VFS_RETURNED);
-}
 
+       return error;
+}
 
-extern unsigned int vp_pagein, vp_pgodirty, vp_pgoclean;
-extern unsigned int dp_pgins, dp_pgouts;
+static void
+mount_end_update(mount_t mp)
+{
+       lck_rw_done(&mp->mnt_rwlock);
+}
 
-/* ARGSUSED */
-int
-sync(__unused struct proc *p, __unused struct sync_args *uap, __unused register_t *retval)
+static int
+get_imgsrc_rootvnode(uint32_t height, vnode_t *rvpp)
 {
+       vnode_t vp;
 
-       vfs_iterate(LK_NOWAIT, sync_callback, (void *)0);
-       {
-       if(print_vmpage_stat) {
-               vm_countdirtypages();
-               printf("VP: %d: %d: %d: %d: %d\n", vp_pgodirty, vp_pgoclean, vp_pagein,
-                       dp_pgins, dp_pgouts);
+       if (height >= MAX_IMAGEBOOT_NESTING) {
+               return EINVAL;
        }
+
+       vp = imgsrc_rootvnodes[height];
+       if ((vp != NULLVP) && (vnode_get(vp) == 0)) {
+               *rvpp = vp;
+               return 0;
+       } else {
+               return ENOENT;
        }
-#if DIAGNOSTIC
-       if (syncprt)
-               vfs_bufstats();
-#endif /* DIAGNOSTIC */
-       return (0);
 }
 
-/*
- * Change filesystem quotas.
- */
-/* ARGSUSED */
-int
-quotactl(struct proc *p, register struct quotactl_args *uap, __unused register_t *retval)
+static int
+relocate_imageboot_source(vnode_t pvp, vnode_t vp, struct componentname *cnp,
+               const char *fsname, vfs_context_t ctx,
+               boolean_t is64bit, user_addr_t fsmountargs, boolean_t by_index)
 {
-       register struct mount *mp;
-       int error, quota_cmd, quota_status;
-       caddr_t datap;
-       size_t fnamelen;
-       struct nameidata nd;
-       struct vfs_context context;
-       struct dqblk my_dqblk;
+       int error;
+       mount_t mp;
+       boolean_t placed = FALSE;
+       vnode_t devvp = NULLVP;
+       struct vfstable *vfsp;
+       user_addr_t devpath;
+       char *old_mntonname;
+       vnode_t rvp;
+       uint32_t height;
+       uint32_t flags;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       /* If we didn't imageboot, nothing to move */
+       if (imgsrc_rootvnodes[0] == NULLVP) {
+               return EINVAL;
+       }
 
-       AUDIT_ARG(uid, uap->uid, 0, 0, 0);
-       AUDIT_ARG(cmd, uap->cmd);
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               return (error);
-       mp = nd.ni_vp->v_mount;
-       vnode_put(nd.ni_vp);
-       nameidone(&nd);
+       /* Only root can do this */
+       if (!vfs_context_issuser(ctx)) {
+               return EPERM;
+       }
 
-       /* copyin any data we will need for downstream code */
-       quota_cmd = uap->cmd >> SUBCMDSHIFT;
+       IMGSRC_DEBUG("looking for root vnode.\n");
 
-       switch (quota_cmd) {
-       case Q_QUOTAON:
-               /* uap->arg specifies a file from which to take the quotas */
-               fnamelen = MAXPATHLEN;
-               datap = kalloc(MAXPATHLEN);
-               error = copyinstr(uap->arg, datap, MAXPATHLEN, &fnamelen);
-               break;
-       case Q_GETQUOTA:
-               /* uap->arg is a pointer to a dqblk structure. */
-               datap = (caddr_t) &my_dqblk;
-               break;
-       case Q_SETQUOTA:
-       case Q_SETUSE:
-               /* uap->arg is a pointer to a dqblk structure. */
-               datap = (caddr_t) &my_dqblk;
-               if (proc_is64bit(p)) {
-                       struct user_dqblk       my_dqblk64;
-                       error = copyin(uap->arg, (caddr_t)&my_dqblk64, sizeof (my_dqblk64));
-                       if (error == 0) {
-                               munge_dqblk(&my_dqblk, &my_dqblk64, FALSE);
+       /*
+        * Get root vnode of filesystem we're moving.
+        */
+       if (by_index) {
+               if (is64bit) {
+                       struct user64_mnt_imgsrc_args mia64;
+                       error = copyin(fsmountargs, &mia64, sizeof(mia64));
+                       if (error != 0) {
+                               IMGSRC_DEBUG("Failed to copy in arguments.\n");
+                               return error;
                        }
+
+                       height = mia64.mi_height;
+                       flags = mia64.mi_flags;
+                       devpath = mia64.mi_devpath;
+               } else {
+                       struct user32_mnt_imgsrc_args mia32;
+                       error = copyin(fsmountargs, &mia32, sizeof(mia32));
+                       if (error != 0) {
+                               IMGSRC_DEBUG("Failed to copy in arguments.\n");
+                               return error;
+                       }
+
+                       height = mia32.mi_height;
+                       flags = mia32.mi_flags;
+                       devpath = mia32.mi_devpath;
                }
-               else {
-                       error = copyin(uap->arg, (caddr_t)&my_dqblk, sizeof (my_dqblk));
+       } else {
+               /*
+                * For binary compatibility--assumes one level of nesting.
+                */
+               if (is64bit) {
+                       if ( (error = copyin(fsmountargs, (caddr_t)&devpath, sizeof(devpath))) )
+                               return error;
+               } else {
+                       user32_addr_t tmp;
+                       if ( (error = copyin(fsmountargs, (caddr_t)&tmp, sizeof(tmp))) )
+                               return error;
+
+                       /* munge into LP64 addr */
+                       devpath = CAST_USER_ADDR_T(tmp);
                }
-               break;
-       case Q_QUOTASTAT:
-               /* uap->arg is a pointer to an integer */
-               datap = (caddr_t) &quota_status;
-               break;
-       default:
-               datap = NULL;
-               break;
-       } /* switch */
 
-       if (error == 0) {
-               error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, datap, &context);
+               height = 0;
+               flags = 0;
        }
 
-       switch (quota_cmd) {
-       case Q_QUOTAON:
-               if (datap != NULL)
-                       kfree(datap, MAXPATHLEN);
-               break;
-       case Q_GETQUOTA:
-               /* uap->arg is a pointer to a dqblk structure we need to copy out to */
-               if (error == 0) {
-                       if (proc_is64bit(p)) {
-                               struct user_dqblk       my_dqblk64;
-                               munge_dqblk(&my_dqblk, &my_dqblk64, TRUE);
-                               error = copyout((caddr_t)&my_dqblk64, uap->arg, sizeof (my_dqblk64));
-                       }
-                       else {
-                               error = copyout(datap, uap->arg, sizeof (struct dqblk));
-                       }
-               }
-               break;
-       case Q_QUOTASTAT:
-               /* uap->arg is a pointer to an integer */
-               if (error == 0) {
-                       error = copyout(datap, uap->arg, sizeof(quota_status));
-               }
-               break;
-       default:
-               break;
-       } /* switch */
+       if (flags != 0) {
+               IMGSRC_DEBUG("%s: Got nonzero flags.\n", __FUNCTION__);
+               return EINVAL;
+       }
 
-       return (error);
-}
+       error = get_imgsrc_rootvnode(height, &rvp);
+       if (error != 0) {
+               IMGSRC_DEBUG("getting root vnode failed with %d\n", error);
+               return error;
+       }
 
-/*
- * Get filesystem statistics.
- */
-/* ARGSUSED */
-int
-statfs(struct proc *p, register struct statfs_args *uap, __unused register_t *retval)
-{
-       struct mount *mp;
-       struct vfsstatfs *sp;
-       int error;
-       struct nameidata nd;
-       struct vfs_context context;
-       vnode_t vp;
+       IMGSRC_DEBUG("got root vnode.\n");
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       MALLOC(old_mntonname, char*, MAXPATHLEN, M_TEMP, M_WAITOK);
 
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               return (error);
-       vp = nd.ni_vp;
-       mp = vp->v_mount;
-       sp = &mp->mnt_vfsstat;
-       nameidone(&nd);
+       /* Can only move once */
+       mp = vnode_mount(rvp);
+       if ((mp->mnt_kern_flag & MNTK_HAS_MOVED) == MNTK_HAS_MOVED) {
+               IMGSRC_DEBUG("Already moved.\n");
+               error = EBUSY;
+               goto out0;
+       }
 
-       error = vfs_update_vfsstat(mp, &context);
-       vnode_put(vp);
-       if (error != 0) 
-               return (error);
+       IMGSRC_DEBUG("Starting updated.\n");
 
-       error = munge_statfs(mp, sp, uap->buf, NULL, IS_64BIT_PROCESS(p), TRUE);
-       return (error);
-}
+       /* Get exclusive rwlock on mount, authorize update on mp */
+       error = mount_begin_update(mp , ctx, 0);
+       if (error != 0) {
+               IMGSRC_DEBUG("Starting updated failed with %d\n", error);
+               goto out0;
+       }
 
-/*
- * Get filesystem statistics.
- */
-/* ARGSUSED */
-int
-fstatfs(struct proc *p, register struct fstatfs_args *uap, __unused register_t *retval)
-{
-       struct vnode *vp;
-       struct mount *mp;
-       struct vfsstatfs *sp;
-       int error;
-       struct vfs_context context;
+       /*
+        * It can only be moved once.  Flag is set under the rwlock,
+        * so we're now safe to proceed.
+        */
+       if ((mp->mnt_kern_flag & MNTK_HAS_MOVED) == MNTK_HAS_MOVED) {
+               IMGSRC_DEBUG("Already moved [2]\n");
+               goto out1;
+       }
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
 
-       AUDIT_ARG(fd, uap->fd);
+       IMGSRC_DEBUG("Preparing coveredvp.\n");
 
-       if ( (error = file_vnode(uap->fd, &vp)) )
-               return (error);
+       /* Mark covered vnode as mount in progress, authorize placing mount on top */
+       error = prepare_coveredvp(vp, ctx, cnp, fsname, FALSE);
+       if (error != 0) {
+               IMGSRC_DEBUG("Preparing coveredvp failed with %d.\n", error);
+               goto out1;
+       }
 
-       AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
+       IMGSRC_DEBUG("Covered vp OK.\n");
 
-       mp = vp->v_mount;
-       if (!mp) {
-               file_drop(uap->fd);
-               return (EBADF);
-       }
-       sp = &mp->mnt_vfsstat;
-       if ((error = vfs_update_vfsstat(mp, &context)) != 0) {
-               file_drop(uap->fd);
-               return (error);
+       /* Sanity check the name caller has provided */
+       vfsp = mp->mnt_vtable;
+       if (strncmp(vfsp->vfc_name, fsname, MFSNAMELEN) != 0) {
+               IMGSRC_DEBUG("Wrong fs name.\n");
+               error = EINVAL;
+               goto out2;
        }
-       file_drop(uap->fd);
 
-       error = munge_statfs(mp, sp, uap->buf, NULL, IS_64BIT_PROCESS(p), TRUE);
+       /* Check the device vnode and update mount-from name, for local filesystems */
+       if (vfsp->vfc_vfsflags & VFC_VFSLOCALARGS) {
+               IMGSRC_DEBUG("Local, doing device validation.\n");
 
-       return (error);
-}
+               if (devpath != USER_ADDR_NULL) {
+                       error = authorize_devpath_and_update_mntfromname(mp, devpath, &devvp, ctx);
+                       if (error) {
+                               IMGSRC_DEBUG("authorize_devpath_and_update_mntfromname() failed.\n");
+                               goto out2;
+                       }
 
+                       vnode_put(devvp);
+               }
+       }
 
-struct getfsstat_struct {
-       user_addr_t     sfsp;
-       int             count;
-       int             maxcount;
-       int             flags;
-       int             error;
-};
+       /*
+        * Place mp on top of vnode, ref the vnode,  call checkdirs(),
+        * and increment the name cache's mount generation
+        */
 
+       IMGSRC_DEBUG("About to call place_mount_and_checkdirs().\n");
+       error = place_mount_and_checkdirs(mp, vp, ctx);
+       if (error != 0) {
+               goto out2;
+       }
 
-static int
-getfsstat_callback(mount_t mp, void * arg)
-{
-       
-       struct getfsstat_struct *fstp = (struct getfsstat_struct *)arg;
-       struct vfsstatfs *sp;
-       struct proc * p = current_proc();
-       int error, my_size;
-       struct vfs_context context;
+       placed = TRUE;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       strlcpy(old_mntonname, mp->mnt_vfsstat.f_mntonname, MAXPATHLEN);
+       strlcpy(mp->mnt_vfsstat.f_mntonname, cnp->cn_pnbuf, MAXPATHLEN);
 
-       if (fstp->sfsp && fstp->count < fstp->maxcount) {
-               sp = &mp->mnt_vfsstat;
-               /*
-                * If MNT_NOWAIT is specified, do not refresh the
-                * fsstat cache. MNT_WAIT overrides MNT_NOWAIT.
-                */
-               if (((fstp->flags & MNT_NOWAIT) == 0 || (fstp->flags & MNT_WAIT)) &&
-                       (error = vfs_update_vfsstat(mp, &context))) {
-                       KAUTH_DEBUG("vfs_update_vfsstat returned %d", error);
-                       return(VFS_RETURNED);
-               }
+       /* Forbid future moves */
+       mount_lock(mp);
+       mp->mnt_kern_flag |= MNTK_HAS_MOVED;
+       mount_unlock(mp);
 
+       /* Finally, add to mount list, completely ready to go */
+       if (mount_list_add(mp) != 0) {
                /*
-                * Need to handle LP64 version of struct statfs
+                * The system is shutting down trying to umount
+                * everything, so fail with a plausible errno.
                 */
-               error = munge_statfs(mp, sp, fstp->sfsp, &my_size, IS_64BIT_PROCESS(p), FALSE);
-               if (error) {
-                       fstp->error = error;
-                       return(VFS_RETURNED_DONE);
-               }
-               fstp->sfsp += my_size;
+               error = EBUSY;
+               goto out3;
        }
-       fstp->count++;
-       return(VFS_RETURNED);
-}
 
-/*
- * Get statistics on all filesystems.
- */
-int
-getfsstat(__unused proc_t p, struct getfsstat_args *uap, int *retval)
-{
-       user_addr_t sfsp;
-       int count, maxcount;
-       struct getfsstat_struct fst;
+       mount_end_update(mp);
+       vnode_put(rvp);
+       FREE(old_mntonname, M_TEMP);
 
-       if (IS_64BIT_PROCESS(p)) {
-               maxcount = uap->bufsize / sizeof(struct user_statfs);
-       }
-       else {
-               maxcount = uap->bufsize / sizeof(struct statfs);
-       }
-       sfsp = uap->buf;
-       count = 0;
+       vfs_notify_mount(pvp);
 
-       fst.sfsp = sfsp;
-       fst.flags = uap->flags;
-       fst.count = 0;
-       fst.error = 0;
-       fst.maxcount = maxcount;
+       return 0;
+out3:
+       strlcpy(mp->mnt_vfsstat.f_mntonname, old_mntonname, MAXPATHLEN);
 
-       
-       vfs_iterate(0, getfsstat_callback, &fst);
+       mount_lock(mp);
+       mp->mnt_kern_flag &= ~(MNTK_HAS_MOVED);
+       mount_unlock(mp);
 
-       if (fst.error ) {
-               KAUTH_DEBUG("ERROR - %s gets %d", p->p_comm, fst.error);
-               return(fst.error);
+out2:
+       /*
+        * Placing the mp on the vnode clears VMOUNT,
+        * so cleanup is different after that point
+        */
+       if (placed) {
+               /* Rele the vp, clear VMOUNT and v_mountedhere */
+               undo_place_on_covered_vp(mp, vp);
+       } else {
+               vnode_lock_spin(vp);
+               CLR(vp->v_flag, VMOUNT);
+               vnode_unlock(vp);
        }
+out1:
+       mount_end_update(mp);
 
-       if (fst.sfsp && fst.count > fst.maxcount)
-               *retval = fst.maxcount;
-       else
-               *retval = fst.count;
-       return (0);
+out0:
+       vnode_put(rvp);
+       FREE(old_mntonname, M_TEMP);
+       return error;
 }
 
-#if COMPAT_GETFSSTAT
-ogetfsstat(p, uap, retval)
-       struct proc *p;
-       register struct getfsstat_args *uap;
-       register_t *retval;
+#endif /* CONFIG_IMGSRC_ACCESS */
+
+void
+enablequotas(struct mount *mp, vfs_context_t ctx)
 {
-       return (ENOTSUP);
+       struct nameidata qnd;
+       int type;
+       char qfpath[MAXPATHLEN];
+       const char *qfname = QUOTAFILENAME;
+       const char *qfopsname = QUOTAOPSNAME;
+       const char *qfextension[] = INITQFNAMES;
+
+       /* XXX Shoulkd be an MNTK_ flag, instead of strncmp()'s */
+       if (strncmp(mp->mnt_vfsstat.f_fstypename, "hfs", sizeof("hfs")) != 0 ) {
+               return;
+       }
+       /*
+        * Enable filesystem disk quotas if necessary.
+        * We ignore errors as this should not interfere with final mount
+        */
+       for (type=0; type < MAXQUOTAS; type++) {
+               snprintf(qfpath, sizeof(qfpath), "%s/%s.%s", mp->mnt_vfsstat.f_mntonname, qfopsname, qfextension[type]);
+               NDINIT(&qnd, LOOKUP, OP_MOUNT, FOLLOW, UIO_SYSSPACE,
+                      CAST_USER_ADDR_T(qfpath), ctx);
+               if (namei(&qnd) != 0)
+                       continue;           /* option file to trigger quotas is not present */
+               vnode_put(qnd.ni_vp);
+               nameidone(&qnd);
+               snprintf(qfpath, sizeof(qfpath),  "%s/%s.%s", mp->mnt_vfsstat.f_mntonname, qfname, qfextension[type]);
+
+               (void) VFS_QUOTACTL(mp, QCMD(Q_QUOTAON, type), 0, qfpath, ctx);
+       }
+       return;
 }
-#endif
 
-/*
- * Change current working directory to a given file descriptor.
- */
-/* ARGSUSED */
-int
-fchdir(struct proc *p, struct fchdir_args *uap, __unused register_t *retval)
+
+static int
+checkdirs_callback(proc_t p, void * arg)
 {
-       register struct filedesc *fdp = p->p_fd;
-       struct vnode *vp, *tdp, *tvp;
-       struct mount *mp;
-       int error;
-       struct vfs_context context;
+       struct cdirargs * cdrp = (struct cdirargs * )arg;
+       vnode_t olddp = cdrp->olddp;
+       vnode_t newdp = cdrp->newdp;
+       struct filedesc *fdp;
+       vnode_t tvp;
+       vnode_t fdp_cvp;
+       vnode_t fdp_rvp;
+       int cdir_changed = 0;
+       int rdir_changed = 0;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       /*
+        * XXX Also needs to iterate each thread in the process to see if it
+        * XXX is using a per-thread current working directory, and, if so,
+        * XXX update that as well.
+        */
 
-       if ( (error = file_vnode(uap->fd, &vp)) )
-               return(error);
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
+       proc_fdlock(p);
+       fdp = p->p_fd;
+       if (fdp == (struct filedesc *)0) {
+               proc_fdunlock(p);
+               return(PROC_RETURNED);
        }
+       fdp_cvp = fdp->fd_cdir;
+       fdp_rvp = fdp->fd_rdir;
+       proc_fdunlock(p);
 
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
-
-       if (vp->v_type != VDIR)
-               error = ENOTDIR;
-       else
-               error = vnode_authorize(vp, NULL, KAUTH_VNODE_SEARCH, &context);
-       while (!error && (mp = vp->v_mountedhere) != NULL) {
-               if (vfs_busy(mp, LK_NOWAIT)) {
-                       error = EACCES;
-                       goto out;
-               }
-               error = VFS_ROOT(mp, &tdp, &context);
-               vfs_unbusy(mp);
-               if (error)
-                       break;
-               vnode_put(vp);
-               vp = tdp;
+       if (fdp_cvp == olddp) {
+               vnode_ref(newdp);
+               tvp = fdp->fd_cdir;
+               fdp_cvp = newdp;
+               cdir_changed = 1;
+               vnode_rele(tvp);
        }
-       if (error)
-               goto out;
-       if ( (error = vnode_ref(vp)) )
-               goto out;
-       vnode_put(vp);
+       if (fdp_rvp == olddp) {
+               vnode_ref(newdp);
+               tvp = fdp->fd_rdir;
+               fdp_rvp = newdp;
+               rdir_changed = 1;
+               vnode_rele(tvp);
+       }
+       if (cdir_changed || rdir_changed) {
+               proc_fdlock(p);
+               fdp->fd_cdir = fdp_cvp;
+               fdp->fd_rdir = fdp_rvp;
+               proc_fdunlock(p);
+       }
+       return(PROC_RETURNED);
+}
 
-       proc_fdlock(p);
-       tvp = fdp->fd_cdir;
-       fdp->fd_cdir = vp;
-       proc_fdunlock(p);
 
-       if (tvp)
-               vnode_rele(tvp);
-       file_drop(uap->fd);
 
-       return (0);
-out:
-       vnode_put(vp);
-       file_drop(uap->fd);
+/*
+ * Scan all active processes to see if any of them have a current
+ * or root directory onto which the new filesystem has just been
+ * mounted. If so, replace them with the new mount point.
+ */
+static int
+checkdirs(vnode_t olddp, vfs_context_t ctx)
+{
+       vnode_t newdp;
+       vnode_t tvp;
+       int err;
+       struct cdirargs cdr;
 
-       return(error);
+       if (olddp->v_usecount == 1)
+               return(0);
+       err = VFS_ROOT(olddp->v_mountedhere, &newdp, ctx);
+
+       if (err != 0) {
+#if DIAGNOSTIC
+               panic("mount: lost mount: error %d", err);
+#endif
+               return(err);
+       }
+
+       cdr.olddp = olddp;
+       cdr.newdp = newdp;
+       /* do not block for exec/fork trans as the vp in cwd & rootdir are not changing */
+       proc_iterate(PROC_ALLPROCLIST | PROC_NOWAITTRANS, checkdirs_callback, (void *)&cdr, NULL, NULL);
+
+       if (rootvnode == olddp) {
+               vnode_ref(newdp);
+               tvp = rootvnode;
+               rootvnode = newdp;
+               vnode_rele(tvp);
+       }
+
+       vnode_put(newdp);
+       return(0);
 }
 
 /*
- * Change current working directory (``.'').
+ * Unmount a file system.
+ *
+ * Note: unmount takes a path to the vnode mounted on as argument,
+ * not special file (as before).
  */
 /* ARGSUSED */
 int
-chdir(struct proc *p, struct chdir_args *uap, __unused register_t *retval)
+unmount(__unused proc_t p, struct unmount_args *uap, __unused int32_t *retval)
 {
-       register struct filedesc *fdp = p->p_fd;
+       vnode_t vp;
+       struct mount *mp;
        int error;
        struct nameidata nd;
-       struct vnode *tvp;
-       struct vfs_context context;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       vfs_context_t ctx = vfs_context_current();
 
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = change_dir(&nd, &context);
+       NDINIT(&nd, LOOKUP, OP_UNMOUNT, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       error = namei(&nd);
        if (error)
                return (error);
-       if ( (error = vnode_ref(nd.ni_vp)) ) {
-               vnode_put(nd.ni_vp);
+       vp = nd.ni_vp;
+       mp = vp->v_mount;
+       nameidone(&nd);
+
+#if CONFIG_MACF
+       error = mac_mount_check_umount(ctx, mp);
+       if (error != 0) {
+               vnode_put(vp);
                return (error);
        }
+#endif
        /*
-        * drop the iocount we picked up in change_dir
+        * Must be the root of the filesystem
         */
-       vnode_put(nd.ni_vp);
-
-       proc_fdlock(p);
-       tvp = fdp->fd_cdir;
-       fdp->fd_cdir = nd.ni_vp;
-       proc_fdunlock(p);
+       if ((vp->v_flag & VROOT) == 0) {
+               vnode_put(vp);
+               return (EINVAL);
+       }
+       mount_ref(mp, 0);
+       vnode_put(vp);
+       /* safedounmount consumes the mount ref */
+       return (safedounmount(mp, uap->flags, ctx));
+}
 
-       if (tvp)
-               vnode_rele(tvp);
+int
+vfs_unmountbyfsid(fsid_t *fsid, int flags, vfs_context_t ctx)
+{
+       mount_t mp;
 
-       return (0);
+       mp = mount_list_lookupby_fsid(fsid, 0, 1);
+       if (mp == (mount_t)0) {
+               return(ENOENT);
+       }
+       mount_ref(mp, 0);
+       mount_iterdrop(mp);
+       /* safedounmount consumes the mount ref */
+       return(safedounmount(mp, flags, ctx));
 }
 
+
 /*
- * Change notion of root (``/'') directory.
+ * The mount struct comes with a mount ref which will be consumed.
+ * Do the actual file system unmount, prevent some common foot shooting.
  */
-/* ARGSUSED */
 int
-chroot(struct proc *p, struct chroot_args *uap, __unused register_t *retval)
+safedounmount(struct mount *mp, int flags, vfs_context_t ctx)
 {
-       register struct filedesc *fdp = p->p_fd;
        int error;
-       struct nameidata nd;
-       boolean_t       shared_regions_active;
-       struct vnode *tvp;
-       struct vfs_context context;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       if ((error = suser(kauth_cred_get(), &p->p_acflag)))
-               return (error);
-
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = change_dir(&nd, &context);
-       if (error)
-               return (error);
+       proc_t p = vfs_context_proc(ctx);
 
-       if(p->p_flag & P_NOSHLIB) {
-               shared_regions_active = FALSE;
-       } else {
-               shared_regions_active = TRUE;
+       /*
+        * If the file system is not responding and MNT_NOBLOCK
+        * is set and not a forced unmount then return EBUSY.
+        */
+       if ((mp->mnt_kern_flag & MNT_LNOTRESP) &&
+               (flags & MNT_NOBLOCK) && ((flags & MNT_FORCE) == 0)) {
+               error = EBUSY;
+               goto out;
        }
-       if ((error = clone_system_shared_regions(shared_regions_active,
-                                                TRUE, /* chain_regions */
-                                                (int)nd.ni_vp))) {
-               vnode_put(nd.ni_vp);
-               return (error);
+
+       /*
+        * Skip authorization if the mount is tagged as permissive and
+        * this is not a forced-unmount attempt.
+        */
+       if (!(((mp->mnt_kern_flag & MNTK_PERMIT_UNMOUNT) != 0) && ((flags & MNT_FORCE) == 0))) {
+               /*
+                * Only root, or the user that did the original mount is
+                * permitted to unmount this filesystem.
+                */
+               if ((mp->mnt_vfsstat.f_owner != kauth_cred_getuid(kauth_cred_get())) &&
+                               (error = suser(kauth_cred_get(), &p->p_acflag)))
+                       goto out;
        }
-       if ( (error = vnode_ref(nd.ni_vp)) ) {
-               vnode_put(nd.ni_vp);
-               return (error);
+       /*
+        * Don't allow unmounting the root file system.
+        */
+       if (mp->mnt_flag & MNT_ROOTFS) {
+               error = EBUSY; /* the root is always busy */
+               goto out;
        }
-       vnode_put(nd.ni_vp);
 
-       proc_fdlock(p);
-       tvp = fdp->fd_rdir;
-       fdp->fd_rdir = nd.ni_vp;
-       fdp->fd_flags |= FD_CHROOT;
-       proc_fdunlock(p);
+#ifdef CONFIG_IMGSRC_ACCESS
+       if (mp->mnt_kern_flag & MNTK_BACKS_ROOT) {
+               error = EBUSY;
+               goto out;
+       }
+#endif /* CONFIG_IMGSRC_ACCESS */
 
-       if (tvp != NULL)
-               vnode_rele(tvp);
+       return (dounmount(mp, flags, 1, ctx));
 
-       return (0);
+out:
+       mount_drop(mp, 0);
+       return(error);
 }
 
 /*
- * Common routine for chroot and chdir.
+ * Do the actual file system unmount.
  */
-static int
-change_dir(struct nameidata *ndp, vfs_context_t ctx)
+int
+dounmount(struct mount *mp, int flags, int withref, vfs_context_t ctx)
 {
-       struct vnode *vp;
+       vnode_t coveredvp = (vnode_t)0;
        int error;
+       int needwakeup = 0;
+       int forcedunmount = 0;
+       int lflags = 0;
+       struct vnode *devvp = NULLVP;
+#if CONFIG_TRIGGERS
+       proc_t p = vfs_context_proc(ctx);
+       int did_vflush = 0;
+       int pflags_save = 0;
+#endif /* CONFIG_TRIGGERS */
 
-       if ((error = namei(ndp)))
-               return (error);
-       nameidone(ndp);
-       vp = ndp->ni_vp;
-       if (vp->v_type != VDIR)
-               error = ENOTDIR;
-       else
-               error = vnode_authorize(vp, NULL, KAUTH_VNODE_SEARCH, ctx);
-       if (error)
-               vnode_put(vp);
-
-       return (error);
-}
+#if CONFIG_FSE
+       if (!(flags & MNT_FORCE)) {
+               fsevent_unmount(mp, ctx);  /* has to come first! */
+       }
+#endif
 
-/*
- * Check permissions, allocate an open file structure,
- * and call the device open routine if any.
- */
+       mount_lock(mp);
 
-#warning XXX implement uid, gid
-static int
-open1(vfs_context_t ctx, user_addr_t upath, int uflags, struct vnode_attr *vap, register_t *retval)
-{
-       struct proc *p = vfs_context_proc(ctx);
-       register struct filedesc *fdp = p->p_fd;
-       register struct fileproc *fp;
-       register struct vnode *vp;
-       int flags, oflags;
-       struct fileproc *nfp;
-       int type, indx, error;
-       struct flock lf;
-       struct nameidata nd;
+       /*
+        * If already an unmount in progress just return EBUSY.
+        * Even a forced unmount cannot override.
+        */
+       if (mp->mnt_lflag & MNT_LUNMOUNT) {
+               if (withref != 0)
+                       mount_drop(mp, 1);
+               mount_unlock(mp);
+               return (EBUSY);
+       }
 
-       oflags = uflags;
+       if (flags & MNT_FORCE) {
+               forcedunmount = 1;
+               mp->mnt_lflag |= MNT_LFORCE;
+       }
 
-       if ((oflags & O_ACCMODE) == O_ACCMODE)
-               return(EINVAL);
-       flags = FFLAGS(uflags);
+#if CONFIG_TRIGGERS
+       if (flags & MNT_NOBLOCK && p != kernproc)
+               pflags_save = OSBitOrAtomic(P_NOREMOTEHANG, &p->p_flag);
+#endif
 
-       AUDIT_ARG(fflags, oflags);
-       AUDIT_ARG(mode, vap->va_mode);
+       mp->mnt_kern_flag |= MNTK_UNMOUNT;
+       mp->mnt_lflag |= MNT_LUNMOUNT;
+       mp->mnt_flag &=~ MNT_ASYNC;
+       /*
+        * anyone currently in the fast path that
+        * trips over the cached rootvp will be
+        * dumped out and forced into the slow path
+        * to regenerate a new cached value
+        */
+       mp->mnt_realrootvp = NULLVP;
+       mount_unlock(mp);
 
-       if ( (error = falloc(p, &nfp, &indx)) ) {
-               return (error);
+       if (forcedunmount && (flags & MNT_LNOSUB) == 0) {
+               /*
+                * Force unmount any mounts in this filesystem.
+                * If any unmounts fail - just leave them dangling.
+                * Avoids recursion.
+                */
+               (void) dounmount_submounts(mp, flags | MNT_LNOSUB, ctx);
        }
-       fp = nfp;
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, upath, ctx);
-       p->p_dupfd = -indx - 1;                 /* XXX check for fdopen */
 
-       if ((error = vn_open_auth(&nd, &flags, vap))) {
-               if ((error == ENODEV || error == ENXIO) && (p->p_dupfd >= 0)) { /* XXX from fdopen */
-                       if ((error = dupfdopen(fdp, indx, p->p_dupfd, flags, error)) == 0) {
-                               fp_drop(p, indx, 0, 0);
-                               *retval = indx;
-                               return (0);
+       /*
+        * taking the name_cache_lock exclusively will
+        * insure that everyone is out of the fast path who
+        * might be trying to use a now stale copy of
+        * vp->v_mountedhere->mnt_realrootvp
+        * bumping mount_generation causes the cached values
+        * to be invalidated
+        */
+       name_cache_lock();
+       mount_generation++;
+       name_cache_unlock();
+
+
+       lck_rw_lock_exclusive(&mp->mnt_rwlock);
+       if (withref != 0)
+               mount_drop(mp, 0);
+       error = 0;
+       if (forcedunmount == 0) {
+               ubc_umount(mp); /* release cached vnodes */
+               if ((mp->mnt_flag & MNT_RDONLY) == 0) {
+                       error = VFS_SYNC(mp, MNT_WAIT, ctx);
+                       if (error) {
+                               mount_lock(mp);
+                               mp->mnt_kern_flag &= ~MNTK_UNMOUNT;
+                               mp->mnt_lflag &= ~MNT_LUNMOUNT;
+                               mp->mnt_lflag &= ~MNT_LFORCE;
+                               goto out;
                        }
                }
-               if (error == ERESTART)
-                       error = EINTR;
-               fp_free(p, indx, fp);
-
-               return (error);
        }
-       p->p_dupfd = 0;
-       vp = nd.ni_vp;
 
-       fp->f_fglob->fg_flag = flags & (FMASK | O_EVTONLY);
-       fp->f_fglob->fg_type = DTYPE_VNODE;
-       fp->f_fglob->fg_ops = &vnops;
-       fp->f_fglob->fg_data = (caddr_t)vp;
+       /* free disk_conditioner_info structure for this mount */
+       disk_conditioner_unmount(mp);
 
-       if (flags & (O_EXLOCK | O_SHLOCK)) {
-               lf.l_whence = SEEK_SET;
-               lf.l_start = 0;
-               lf.l_len = 0;
-               if (flags & O_EXLOCK)
-                       lf.l_type = F_WRLCK;
-               else
-                       lf.l_type = F_RDLCK;
-               type = F_FLOCK;
-               if ((flags & FNONBLOCK) == 0)
-                       type |= F_WAIT;
-               if ((error = VNOP_ADVLOCK(vp, (caddr_t)fp->f_fglob, F_SETLK, &lf, type, ctx)))
-                       goto bad;
-               fp->f_fglob->fg_flag |= FHASLOCK;
+       IOBSDMountChange(mp, kIOMountChangeUnmount);
+
+#if CONFIG_TRIGGERS
+       vfs_nested_trigger_unmounts(mp, flags, ctx);
+       did_vflush = 1;
+#endif
+       if (forcedunmount)
+               lflags |= FORCECLOSE;
+       error = vflush(mp, NULLVP, SKIPSWAP | SKIPSYSTEM  | SKIPROOT | lflags);
+       if ((forcedunmount == 0) && error) {
+               mount_lock(mp);
+               mp->mnt_kern_flag &= ~MNTK_UNMOUNT;
+               mp->mnt_lflag &= ~MNT_LUNMOUNT;
+               mp->mnt_lflag &= ~MNT_LFORCE;
+               goto out;
        }
 
-       /* try to truncate by setting the size attribute */
-       if ((flags & O_TRUNC) && ((error = vnode_setsize(vp, (off_t)0, 0, ctx)) != 0))
-               goto bad;
+       /* make sure there are no one in the mount iterations or lookup */
+       mount_iterdrain(mp);
 
-       vnode_put(vp);
+       error = VFS_UNMOUNT(mp, flags, ctx);
+       if (error) {
+               mount_iterreset(mp);
+               mount_lock(mp);
+               mp->mnt_kern_flag &= ~MNTK_UNMOUNT;
+               mp->mnt_lflag &= ~MNT_LUNMOUNT;
+               mp->mnt_lflag &= ~MNT_LFORCE;
+               goto out;
+       }
 
-       proc_fdlock(p);
-       *fdflags(p, indx) &= ~UF_RESERVED;
-       fp_drop(p, indx, fp, 1);
-       proc_fdunlock(p);
+       /* increment the operations count */
+       if (!error)
+               OSAddAtomic(1, &vfs_nummntops);
 
-       *retval = indx;
+       if ( mp->mnt_devvp && mp->mnt_vtable->vfc_vfsflags & VFC_VFSLOCALARGS) {
+               /* hold an io reference and drop the usecount before close */
+               devvp = mp->mnt_devvp;
+               vnode_getalways(devvp);
+               vnode_rele(devvp);
+               VNOP_CLOSE(devvp, mp->mnt_flag & MNT_RDONLY ? FREAD : FREAD|FWRITE,
+                       ctx);
+               vnode_clearmountedon(devvp);
+               vnode_put(devvp);
+       }
+       lck_rw_done(&mp->mnt_rwlock);
+       mount_list_remove(mp);
+       lck_rw_lock_exclusive(&mp->mnt_rwlock);
 
-       return (0);
-bad:
-       vn_close(vp, fp->f_fglob->fg_flag, fp->f_fglob->fg_cred, p);
-       vnode_put(vp);
-       fp_free(p, indx, fp);
+       /* mark the mount point hook in the vp but not drop the ref yet */
+       if ((coveredvp = mp->mnt_vnodecovered) != NULLVP) {
+               /*
+                * The covered vnode needs special handling. Trying to get an
+                * iocount must not block here as this may lead to deadlocks
+                * if the Filesystem to which the covered vnode belongs is
+                * undergoing forced unmounts. Since we hold a usecount, the
+                * vnode cannot be reused (it can, however, still be terminated)
+                */
+               vnode_getalways(coveredvp);
+               vnode_lock_spin(coveredvp);
 
-       return (error);
+               mp->mnt_crossref++;
+               coveredvp->v_mountedhere = (struct mount *)0;
+               CLR(coveredvp->v_flag, VMOUNT);
+
+               vnode_unlock(coveredvp);
+               vnode_put(coveredvp);
+       }
+
+       mount_list_lock();
+       mp->mnt_vtable->vfc_refcount--;
+       mount_list_unlock();
+
+       cache_purgevfs(mp);     /* remove cache entries for this file sys */
+       vfs_event_signal(NULL, VQ_UNMOUNT, (intptr_t)NULL);
+       mount_lock(mp);
+       mp->mnt_lflag |= MNT_LDEAD;
+
+       if (mp->mnt_lflag & MNT_LWAIT) {
+               /*
+                * do the wakeup here
+                * in case we block in mount_refdrain
+                * which will drop the mount lock
+                * and allow anyone blocked in vfs_busy
+                * to wakeup and see the LDEAD state
+                */
+               mp->mnt_lflag &= ~MNT_LWAIT;
+               wakeup((caddr_t)mp);
+       }
+       mount_refdrain(mp);
+out:
+       if (mp->mnt_lflag & MNT_LWAIT) {
+               mp->mnt_lflag &= ~MNT_LWAIT;
+               needwakeup = 1;
+       }
+
+#if CONFIG_TRIGGERS
+       if (flags & MNT_NOBLOCK && p != kernproc) {
+               // Restore P_NOREMOTEHANG bit to its previous value
+               if ((pflags_save & P_NOREMOTEHANG) == 0)
+                       OSBitAndAtomic(~((uint32_t) P_NOREMOTEHANG), &p->p_flag);
+       }
+
+       /*
+        * Callback and context are set together under the mount lock, and
+        * never cleared, so we're safe to examine them here, drop the lock,
+        * and call out.
+        */
+       if (mp->mnt_triggercallback != NULL) {
+               mount_unlock(mp);
+               if (error == 0) {
+                       mp->mnt_triggercallback(mp, VTC_RELEASE, mp->mnt_triggerdata, ctx);
+               } else if (did_vflush) {
+                       mp->mnt_triggercallback(mp, VTC_REPLACE, mp->mnt_triggerdata, ctx);
+               }
+       } else {
+               mount_unlock(mp);
+       }
+#else
+       mount_unlock(mp);
+#endif /* CONFIG_TRIGGERS */
+
+       lck_rw_done(&mp->mnt_rwlock);
+
+       if (needwakeup)
+               wakeup((caddr_t)mp);
+
+       if (!error) {
+               if ((coveredvp != NULLVP)) {
+                       vnode_t pvp = NULLVP;
+
+                       /*
+                        * The covered vnode needs special handling. Trying to
+                        * get an iocount must not block here as this may lead
+                        * to deadlocks if the Filesystem to which the covered
+                        * vnode belongs is undergoing forced unmounts. Since we
+                        * hold a usecount, the  vnode cannot be reused
+                        * (it can, however, still be terminated).
+                        */
+                       vnode_getalways(coveredvp);
+
+                       mount_dropcrossref(mp, coveredvp, 0);
+                       /*
+                        * We'll _try_ to detect if this really needs to be
+                        * done. The coveredvp can only be in termination (or
+                        * terminated) if the coveredvp's mount point is in a
+                        * forced unmount (or has been) since we still hold the
+                        * ref.
+                        */
+                       if (!vnode_isrecycled(coveredvp)) {
+                               pvp = vnode_getparent(coveredvp);
+#if CONFIG_TRIGGERS
+                               if (coveredvp->v_resolve) {
+                                       vnode_trigger_rearm(coveredvp, ctx);
+                               }
+#endif
+                       }
+
+                       vnode_rele(coveredvp);
+                       vnode_put(coveredvp);
+                       coveredvp = NULLVP;
 
+                       if (pvp) {
+                               lock_vnode_and_post(pvp, NOTE_WRITE);
+                               vnode_put(pvp);
+                       }
+               } else if (mp->mnt_flag & MNT_ROOTFS) {
+                               mount_lock_destroy(mp);
+#if CONFIG_MACF
+                               mac_mount_label_destroy(mp);
+#endif
+                               FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
+               } else
+                       panic("dounmount: no coveredvp");
+       }
+       return (error);
 }
 
-int
-open_extended(struct proc *p, struct open_extended_args *uap, register_t *retval)
+/*
+ * Unmount any mounts in this filesystem.
+ */
+void
+dounmount_submounts(struct mount *mp, int flags, vfs_context_t ctx)
 {
-       struct vfs_context context;
-       register struct filedesc *fdp = p->p_fd;
-       int ciferror;
-       kauth_filesec_t xsecdst;
-       struct vnode_attr va;
-       int cmode;
-
-       xsecdst = NULL;
-       if ((uap->xsecurity != USER_ADDR_NULL) &&
-           ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0))
-               return ciferror;
+       mount_t smp;
+       fsid_t *fsids, fsid;
+       int fsids_sz;
+       int count = 0, i, m = 0;
+       vnode_t vp;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       mount_list_lock();
 
-       VATTR_INIT(&va);
-       cmode = ((uap->mode &~ fdp->fd_cmask) & ALLPERMS) & ~S_ISTXT;
-       VATTR_SET(&va, va_mode, cmode);
-       if (uap->uid != KAUTH_UID_NONE)
-               VATTR_SET(&va, va_uid, uap->uid);
-       if (uap->gid != KAUTH_GID_NONE)
-               VATTR_SET(&va, va_gid, uap->gid);
-       if (xsecdst != NULL)
-               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
+       // Get an array to hold the submounts fsids.
+       TAILQ_FOREACH(smp, &mountlist, mnt_list)
+               count++;
+       fsids_sz = count * sizeof(fsid_t);
+       MALLOC(fsids, fsid_t *, fsids_sz, M_TEMP, M_NOWAIT);
+       if (fsids == NULL) {
+               mount_list_unlock();
+               goto out;
+       }
+       fsids[0] = mp->mnt_vfsstat.f_fsid;      // Prime the pump
 
-       ciferror = open1(&context, uap->path, uap->flags, &va, retval);
-       if (xsecdst != NULL)
-               kauth_filesec_free(xsecdst);
+       /*
+        * Fill the array with submount fsids.
+        * Since mounts are always added to the tail of the mount list, the
+        * list is always in mount order.
+        * For each mount check if the mounted-on vnode belongs to a
+        * mount that's already added to our array of mounts to be unmounted.
+        */
+       for (smp = TAILQ_NEXT(mp, mnt_list); smp; smp = TAILQ_NEXT(smp, mnt_list)) {
+               vp = smp->mnt_vnodecovered;
+               if (vp == NULL)
+                       continue;
+               fsid = vnode_mount(vp)->mnt_vfsstat.f_fsid;     // Underlying fsid
+               for (i = 0; i <= m; i++) {
+                       if (fsids[i].val[0] == fsid.val[0] &&
+                           fsids[i].val[1] == fsid.val[1]) {
+                               fsids[++m] = smp->mnt_vfsstat.f_fsid;
+                               break;
+                       }
+               }
+       }
+       mount_list_unlock();
 
-       return ciferror;
+       // Unmount the submounts in reverse order. Ignore errors.
+       for (i = m; i > 0; i--) {
+               smp = mount_list_lookupby_fsid(&fsids[i], 0, 1);
+               if (smp) {
+                       mount_ref(smp, 0);
+                       mount_iterdrop(smp);
+                       (void) dounmount(smp, flags, 1, ctx);
+               }
+       }
+out:
+       if (fsids)
+               FREE(fsids, M_TEMP);
 }
 
-int
-open(struct proc *p, struct open_args *uap, register_t *retval)
+void
+mount_dropcrossref(mount_t mp, vnode_t dp, int need_put)
 {
-       struct vfs_context context;
-       register struct filedesc *fdp = p->p_fd;
-       struct vnode_attr va;
-       int cmode;
+       vnode_lock(dp);
+       mp->mnt_crossref--;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       if (mp->mnt_crossref < 0)
+               panic("mount cross refs -ve");
 
-       VATTR_INIT(&va);
-       /* Mask off all but regular access permissions */
-       cmode = ((uap->mode &~ fdp->fd_cmask) & ALLPERMS) & ~S_ISTXT;
-       VATTR_SET(&va, va_mode, cmode & ACCESSPERMS);
+       if ((mp != dp->v_mountedhere) && (mp->mnt_crossref == 0)) {
+
+               if (need_put)
+                       vnode_put_locked(dp);
+               vnode_unlock(dp);
 
-       return(open1(&context, uap->path, uap->flags, &va, retval));
+               mount_lock_destroy(mp);
+#if CONFIG_MACF
+               mac_mount_label_destroy(mp);
+#endif
+               FREE_ZONE((caddr_t)mp, sizeof (struct mount), M_MOUNT);
+               return;
+       }
+       if (need_put)
+               vnode_put_locked(dp);
+       vnode_unlock(dp);
 }
 
 
 /*
- * Create a special file.
+ * Sync each mounted filesystem.
  */
-static int mkfifo1(vfs_context_t ctx, user_addr_t upath, struct vnode_attr *vap);
+#if DIAGNOSTIC
+int syncprt = 0;
+#endif
 
-int
-mknod(struct proc *p, register struct mknod_args *uap, __unused register_t *retval)
+int print_vmpage_stat=0;
+
+static int
+sync_callback(mount_t mp, __unused void *arg)
 {
-       struct vnode_attr va;
-       struct vfs_context context;
-       int error;
-       int whiteout = 0;
-       struct nameidata nd;
-       vnode_t vp, dvp;
+       if ((mp->mnt_flag & MNT_RDONLY) == 0) {
+               int asyncflag = mp->mnt_flag & MNT_ASYNC;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+               mp->mnt_flag &= ~MNT_ASYNC;
+               VFS_SYNC(mp, arg ? MNT_WAIT : MNT_NOWAIT, vfs_context_kernel());
+               if (asyncflag)
+                       mp->mnt_flag |= MNT_ASYNC;
+       }
 
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_mode, (uap->mode & ALLPERMS) & ~p->p_fd->fd_cmask);
-       VATTR_SET(&va, va_rdev, uap->dev);
+       return (VFS_RETURNED);
+}
 
-       /* If it's a mknod() of a FIFO, call mkfifo1() instead */
-       if ((uap->mode & S_IFMT) == S_IFIFO)
-               return(mkfifo1(&context, uap->path, &va));
+/* ARGSUSED */
+int
+sync(__unused proc_t p, __unused struct sync_args *uap, __unused int32_t *retval)
+{
+       vfs_iterate(LK_NOWAIT, sync_callback, NULL);
 
-       AUDIT_ARG(mode, uap->mode);
-       AUDIT_ARG(dev, uap->dev);
+       if (print_vmpage_stat) {
+               vm_countdirtypages();
+       }
 
-       if ((error = suser(context.vc_ucred, &p->p_acflag)))
-               return (error);
-       NDINIT(&nd, CREATE, LOCKPARENT | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               return (error);
-       dvp = nd.ni_dvp;
-       vp = nd.ni_vp;
+#if DIAGNOSTIC
+       if (syncprt)
+               vfs_bufstats();
+#endif /* DIAGNOSTIC */
+       return 0;
+}
 
-       if (vp != NULL) {
-               error = EEXIST;
-               goto out;
-       }
+typedef enum {
+       SYNC_ALL = 0,
+       SYNC_ONLY_RELIABLE_MEDIA = 1,
+       SYNC_ONLY_UNRELIABLE_MEDIA = 2
+} sync_type_t;
 
-       if ((error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, &context)) != 0)
-               goto out;
-  
-       switch (uap->mode & S_IFMT) {
-       case S_IFMT:    /* used by badsect to flag bad sectors */
-               VATTR_SET(&va, va_type, VBAD);
-               break;
-       case S_IFCHR:
-               VATTR_SET(&va, va_type, VCHR);
-               break;
-       case S_IFBLK:
-               VATTR_SET(&va, va_type, VBLK);
-               break;
-       case S_IFWHT:
-               whiteout = 1;
-               break;
-       default:
-               error = EINVAL;
-               goto out;
-       }
-       if (whiteout) {
-               error = VNOP_WHITEOUT(dvp, &nd.ni_cnd, CREATE, &context);
-       } else {
-               error = vn_create(dvp, &vp, &nd.ni_cnd, &va, 0, &context);
+static int
+sync_internal_callback(mount_t mp, void *arg)
+{
+       if (arg) {
+               int is_reliable = !(mp->mnt_kern_flag & MNTK_VIRTUALDEV) &&
+                                  (mp->mnt_flag & MNT_LOCAL);
+               sync_type_t sync_type = *((sync_type_t *)arg);
+
+               if ((sync_type == SYNC_ONLY_RELIABLE_MEDIA) && !is_reliable)
+                       return (VFS_RETURNED);
+               else if ((sync_type = SYNC_ONLY_UNRELIABLE_MEDIA) && is_reliable)
+                       return (VFS_RETURNED);
        }
-       if (error)
-               goto out;
 
-       if (vp) {
-               int     update_flags = 0;
+       (void)sync_callback(mp, NULL);
 
-               // Make sure the name & parent pointers are hooked up
-               if (vp->v_name == NULL)
-                       update_flags |= VNODE_UPDATE_NAME;
-               if (vp->v_parent == NULLVP)
-                       update_flags |= VNODE_UPDATE_PARENT;
+       return (VFS_RETURNED);
+}
 
-               if (update_flags)
-                       vnode_update_identity(vp, dvp, nd.ni_cnd.cn_nameptr, nd.ni_cnd.cn_namelen, nd.ni_cnd.cn_hash, update_flags);
+int sync_thread_state = 0;
+int sync_timeout_seconds = 5;
 
-               add_fsevent(FSE_CREATE_FILE, &context,
-                   FSE_ARG_VNODE, vp,
-                   FSE_ARG_DONE);
-       }
+#define SYNC_THREAD_RUN       0x0001
+#define SYNC_THREAD_RUNNING   0x0002
 
-out:
+static void
+sync_thread(__unused void *arg, __unused wait_result_t wr)
+{
+       sync_type_t sync_type;
+
+       lck_mtx_lock(sync_mtx_lck);
+       while (sync_thread_state & SYNC_THREAD_RUN) {
+               sync_thread_state &= ~SYNC_THREAD_RUN;
+               lck_mtx_unlock(sync_mtx_lck);
+
+               sync_type = SYNC_ONLY_RELIABLE_MEDIA;
+               vfs_iterate(LK_NOWAIT, sync_internal_callback, &sync_type);
+               sync_type = SYNC_ONLY_UNRELIABLE_MEDIA;
+               vfs_iterate(LK_NOWAIT, sync_internal_callback, &sync_type);
+
+               lck_mtx_lock(sync_mtx_lck);
+       }
        /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
+        * This wakeup _has_ to be issued before the lock is released otherwise
+        * we may end up waking up a thread in sync_internal which is
+        * expecting a wakeup from a thread it just created and not from this
+        * thread which is about to exit.
         */
-       nameidone(&nd);
+       wakeup(&sync_thread_state);
+       sync_thread_state &= ~SYNC_THREAD_RUNNING;
+       lck_mtx_unlock(sync_mtx_lck);
 
-       if (vp)
-               vnode_put(vp);
-       vnode_put(dvp);
+       if (print_vmpage_stat) {
+               vm_countdirtypages();
+       }
 
-       return (error);
+#if DIAGNOSTIC
+       if (syncprt)
+               vfs_bufstats();
+#endif /* DIAGNOSTIC */
 }
 
+struct timeval sync_timeout_last_print = {0, 0};
+
 /*
- * Create a named pipe.
+ * An in-kernel sync for power management to call.
+ * This function always returns within sync_timeout seconds.
  */
-static int
-mkfifo1(vfs_context_t ctx, user_addr_t upath, struct vnode_attr *vap)
+__private_extern__ int
+sync_internal(void)
 {
-       vnode_t vp, dvp;
+       thread_t thd;
        int error;
+       int thread_created = FALSE;
+       struct timespec ts = {sync_timeout_seconds, 0};
+
+       lck_mtx_lock(sync_mtx_lck);
+       sync_thread_state |= SYNC_THREAD_RUN;
+       if (!(sync_thread_state & SYNC_THREAD_RUNNING)) {
+               int kr;
+
+               sync_thread_state |= SYNC_THREAD_RUNNING;
+               kr = kernel_thread_start(sync_thread, NULL, &thd);
+               if (kr != KERN_SUCCESS) {
+                       sync_thread_state &= ~SYNC_THREAD_RUNNING;
+                       lck_mtx_unlock(sync_mtx_lck);
+                       printf("sync_thread failed\n");
+                       return (0);
+               }
+               thread_created = TRUE;
+       }
+
+       error = msleep((caddr_t)&sync_thread_state, sync_mtx_lck,
+           (PVFS | PDROP | PCATCH), "sync_thread", &ts);
+       if (error) {
+               struct timeval now;
+
+               microtime(&now);
+               if (now.tv_sec - sync_timeout_last_print.tv_sec > 120) {
+                       printf("sync timed out: %d sec\n", sync_timeout_seconds);
+                       sync_timeout_last_print.tv_sec = now.tv_sec;
+               }
+       }
+
+       if (thread_created)
+               thread_deallocate(thd);
+
+       return (0);
+} /* end of sync_internal call */
+
+/*
+ * Change filesystem quotas.
+ */
+#if QUOTA
+int
+quotactl(proc_t p, struct quotactl_args *uap, __unused int32_t *retval)
+{
+       struct mount *mp;
+       int error, quota_cmd, quota_status = 0;
+       caddr_t datap;
+       size_t fnamelen;
        struct nameidata nd;
+       vfs_context_t ctx = vfs_context_current();
+       struct dqblk my_dqblk = {};
 
-       NDINIT(&nd, CREATE, LOCKPARENT | AUDITVNPATH1, 
-               UIO_USERSPACE, upath, ctx);
+       AUDIT_ARG(uid, uap->uid);
+       AUDIT_ARG(cmd, uap->cmd);
+       NDINIT(&nd, LOOKUP, OP_LOOKUP, FOLLOW | AUDITVNPATH1, UIO_USERSPACE,
+              uap->path, ctx);
        error = namei(&nd);
        if (error)
                return (error);
-       dvp = nd.ni_dvp;
-       vp = nd.ni_vp;
-
-       /* check that this is a new file and authorize addition */
-       if (vp != NULL) {
-               error = EEXIST;
-               goto out;
-       }
-       if ((error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, ctx)) != 0)
-               goto out;
-
-       VATTR_SET(vap, va_type, VFIFO);
-       
-       error = vn_create(dvp, &vp, &nd.ni_cnd, vap, 0, ctx);
-out:
-       /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
-        */
+       mp = nd.ni_vp->v_mount;
+       vnode_put(nd.ni_vp);
        nameidone(&nd);
 
-       if (vp)
-               vnode_put(vp);
-       vnode_put(dvp);
-
-       return error;
-}
+       /* copyin any data we will need for downstream code */
+       quota_cmd = uap->cmd >> SUBCMDSHIFT;
 
-int
-mkfifo_extended(struct proc *p, struct mkfifo_extended_args *uap, __unused register_t *retval)
-{
-       int ciferror;
-       kauth_filesec_t xsecdst;
-       struct vfs_context context;
-       struct vnode_attr va;
+       switch (quota_cmd) {
+       case Q_QUOTAON:
+               /* uap->arg specifies a file from which to take the quotas */
+               fnamelen = MAXPATHLEN;
+               datap = kalloc(MAXPATHLEN);
+               error = copyinstr(uap->arg, datap, MAXPATHLEN, &fnamelen);
+               break;
+       case Q_GETQUOTA:
+               /* uap->arg is a pointer to a dqblk structure. */
+               datap = (caddr_t) &my_dqblk;
+               break;
+       case Q_SETQUOTA:
+       case Q_SETUSE:
+               /* uap->arg is a pointer to a dqblk structure. */
+               datap = (caddr_t) &my_dqblk;
+               if (proc_is64bit(p)) {
+                       struct user_dqblk       my_dqblk64;
+                       error = copyin(uap->arg, (caddr_t)&my_dqblk64, sizeof (my_dqblk64));
+                       if (error == 0) {
+                               munge_dqblk(&my_dqblk, &my_dqblk64, FALSE);
+                       }
+               }
+               else {
+                       error = copyin(uap->arg, (caddr_t)&my_dqblk, sizeof (my_dqblk));
+               }
+               break;
+       case Q_QUOTASTAT:
+               /* uap->arg is a pointer to an integer */
+               datap = (caddr_t) &quota_status;
+               break;
+       default:
+               datap = NULL;
+               break;
+       } /* switch */
 
-       xsecdst = KAUTH_FILESEC_NONE;
-       if (uap->xsecurity != USER_ADDR_NULL) {
-               if ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
-                       return ciferror;
+       if (error == 0) {
+               error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, datap, ctx);
        }
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_mode, (uap->mode & ALLPERMS) & ~p->p_fd->fd_cmask);
-       if (uap->uid != KAUTH_UID_NONE)
-               VATTR_SET(&va, va_uid, uap->uid);
-       if (uap->gid != KAUTH_GID_NONE)
-               VATTR_SET(&va, va_gid, uap->gid);
-       if (xsecdst != KAUTH_FILESEC_NONE)
-               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
+       switch (quota_cmd) {
+       case Q_QUOTAON:
+               if (datap != NULL)
+                       kfree(datap, MAXPATHLEN);
+               break;
+       case Q_GETQUOTA:
+               /* uap->arg is a pointer to a dqblk structure we need to copy out to */
+               if (error == 0) {
+                       if (proc_is64bit(p)) {
+                               struct user_dqblk       my_dqblk64;
 
-       ciferror = mkfifo1(&context, uap->path, &va);
+                               memset(&my_dqblk64, 0, sizeof(my_dqblk64));
+                               munge_dqblk(&my_dqblk, &my_dqblk64, TRUE);
+                               error = copyout((caddr_t)&my_dqblk64, uap->arg, sizeof (my_dqblk64));
+                       }
+                       else {
+                               error = copyout(datap, uap->arg, sizeof (struct dqblk));
+                       }
+               }
+               break;
+       case Q_QUOTASTAT:
+               /* uap->arg is a pointer to an integer */
+               if (error == 0) {
+                       error = copyout(datap, uap->arg, sizeof(quota_status));
+               }
+               break;
+       default:
+               break;
+       } /* switch */
 
-       if (xsecdst != KAUTH_FILESEC_NONE)
-               kauth_filesec_free(xsecdst);
-       return ciferror;
+       return (error);
+}
+#else
+int
+quotactl(__unused proc_t p, __unused struct quotactl_args *uap, __unused int32_t *retval)
+{
+       return (EOPNOTSUPP);
 }
+#endif /* QUOTA */
 
+/*
+ * Get filesystem statistics.
+ *
+ * Returns:    0                       Success
+ *     namei:???
+ *     vfs_update_vfsstat:???
+ *     munge_statfs:EFAULT
+ */
 /* ARGSUSED */
 int
-mkfifo(struct proc *p, register struct mkfifo_args *uap, __unused register_t *retval)
+statfs(__unused proc_t p, struct statfs_args *uap, __unused int32_t *retval)
 {
-       struct vfs_context context;
-       struct vnode_attr va;
+       struct mount *mp;
+       struct vfsstatfs *sp;
+       int error;
+       struct nameidata nd;
+       vfs_context_t ctx = vfs_context_current();
+       vnode_t vp;
+
+       NDINIT(&nd, LOOKUP, OP_STATFS, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       error = namei(&nd);
+       if (error != 0)
+               return (error);
+       vp = nd.ni_vp;
+       mp = vp->v_mount;
+       sp = &mp->mnt_vfsstat;
+       nameidone(&nd);
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+#if CONFIG_MACF
+       error = mac_mount_check_stat(ctx, mp);
+       if (error != 0)
+               return (error);
+#endif
 
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_mode, (uap->mode & ALLPERMS) & ~p->p_fd->fd_cmask);
+       error = vfs_update_vfsstat(mp, ctx, VFS_USER_EVENT);
+       if (error != 0) {
+               vnode_put(vp);
+               return (error);
+       }
 
-       return(mkfifo1(&context, uap->path, &va));
+       error = munge_statfs(mp, sp, uap->buf, NULL, IS_64BIT_PROCESS(p), TRUE);
+       vnode_put(vp);
+       return (error);
 }
 
 /*
- * Make a hard file link.
+ * Get filesystem statistics.
  */
 /* ARGSUSED */
 int
-link(struct proc *p, register struct link_args *uap, __unused register_t *retval)
+fstatfs(__unused proc_t p, struct fstatfs_args *uap, __unused int32_t *retval)
 {
-       vnode_t vp, dvp, lvp;
-       struct nameidata nd;
-       struct vfs_context context;
+       vnode_t vp;
+       struct mount *mp;
+       struct vfsstatfs *sp;
        int error;
-       fse_info finfo;
-       int need_event, has_listeners;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-       vp = dvp = lvp = NULLVP;
+       AUDIT_ARG(fd, uap->fd);
 
-       /* look up the object we are linking to */
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
+       if ( (error = file_vnode(uap->fd, &vp)) )
                return (error);
-       vp = nd.ni_vp;
 
-       nameidone(&nd);
+       error = vnode_getwithref(vp);
+       if (error) {
+               file_drop(uap->fd);
+               return (error);
+       }
 
-       /* we're not allowed to link to directories */
-       if (vp->v_type == VDIR) {
-               error = EPERM;   /* POSIX */
+       AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
+
+       mp = vp->v_mount;
+       if (!mp) {
+               error = EBADF;
                goto out;
        }
 
-       /* or to anything that kauth doesn't want us to (eg. immutable items) */
-       if ((error = vnode_authorize(vp, NULL, KAUTH_VNODE_LINKTARGET, &context)) != 0)
-               goto out;
-
-       /* lookup the target node */
-       nd.ni_cnd.cn_nameiop = CREATE;
-       nd.ni_cnd.cn_flags = LOCKPARENT | AUDITVNPATH2;
-       nd.ni_dirp = uap->link;
-       error = namei(&nd);
+#if CONFIG_MACF
+       error = mac_mount_check_stat(vfs_context_current(), mp);
        if (error != 0)
                goto out;
-       dvp = nd.ni_dvp;
-       lvp = nd.ni_vp;
-       /* target node must not exist */
-       if (lvp != NULLVP) {
-               error = EEXIST;
-               goto out2;
+#endif
+
+       sp = &mp->mnt_vfsstat;
+       if ((error = vfs_update_vfsstat(mp, vfs_context_current(), VFS_USER_EVENT)) != 0) {
+               goto out;
        }
-       /* cannot link across mountpoints */
-       if (vnode_mount(vp) != vnode_mount(dvp)) {
-               error = EXDEV;
-               goto out2;
-       }
-               
-       /* authorize creation of the target note */
-       if ((error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, &context)) != 0)
-               goto out2;
 
-       /* and finally make the link */
-       error = VNOP_LINK(vp, dvp, &nd.ni_cnd, &context);
-       if (error)
-               goto out2;
+       error = munge_statfs(mp, sp, uap->buf, NULL, IS_64BIT_PROCESS(p), TRUE);
 
-       need_event = need_fsevent(FSE_CREATE_FILE, dvp);
-       has_listeners = kauth_authorize_fileop_has_listeners();
+out:
+       file_drop(uap->fd);
+       vnode_put(vp);
 
-       if (need_event || has_listeners) {
-               char *target_path = NULL;
-               char *link_to_path = NULL;
-               int len, link_name_len;
+       return (error);
+}
 
-               /* build the path to the new link file */
-               target_path = get_pathbuff();
-               len = MAXPATHLEN;
-               vn_getpath(dvp, target_path, &len);
-               target_path[len-1] = '/';
-               strcpy(&target_path[len], nd.ni_cnd.cn_nameptr);
-               len += nd.ni_cnd.cn_namelen;
+/*
+ * Common routine to handle copying of statfs64 data to user space
+ */
+static int
+statfs64_common(struct mount *mp, struct vfsstatfs *sfsp, user_addr_t bufp)
+{
+       int error;
+       struct statfs64 sfs;
+
+       bzero(&sfs, sizeof(sfs));
+
+       sfs.f_bsize = sfsp->f_bsize;
+       sfs.f_iosize = (int32_t)sfsp->f_iosize;
+       sfs.f_blocks = sfsp->f_blocks;
+       sfs.f_bfree = sfsp->f_bfree;
+       sfs.f_bavail = sfsp->f_bavail;
+       sfs.f_files = sfsp->f_files;
+       sfs.f_ffree = sfsp->f_ffree;
+       sfs.f_fsid = sfsp->f_fsid;
+       sfs.f_owner = sfsp->f_owner;
+       sfs.f_type = mp->mnt_vtable->vfc_typenum;
+       sfs.f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
+       sfs.f_fssubtype = sfsp->f_fssubtype;
+       if (mp->mnt_kern_flag & MNTK_TYPENAME_OVERRIDE) {
+               strlcpy(&sfs.f_fstypename[0], &mp->fstypename_override[0], MFSTYPENAMELEN);
+       } else {
+               strlcpy(&sfs.f_fstypename[0], &sfsp->f_fstypename[0], MFSTYPENAMELEN);
+       }
+       strlcpy(&sfs.f_mntonname[0], &sfsp->f_mntonname[0], MAXPATHLEN);
+       strlcpy(&sfs.f_mntfromname[0], &sfsp->f_mntfromname[0], MAXPATHLEN);
 
-               if (has_listeners) {
-                       /* build the path to file we are linking to */
-                       link_to_path = get_pathbuff();
-                       link_name_len = MAXPATHLEN;
-                       vn_getpath(vp, link_to_path, &link_name_len);
+       error = copyout((caddr_t)&sfs, bufp, sizeof(sfs));
 
-                       /* call out to allow 3rd party notification of rename. 
-                        * Ignore result of kauth_authorize_fileop call.
-                        */
-                       kauth_authorize_fileop(vfs_context_ucred(&context), KAUTH_FILEOP_LINK, 
-                                              (uintptr_t)link_to_path, (uintptr_t)target_path);
-                       if (link_to_path != NULL)
-                               release_pathbuff(link_to_path);
-               }
-               if (need_event) {
-                       /* construct fsevent */
-                       if (get_fse_info(vp, &finfo, &context) == 0) {
-                               // build the path to the destination of the link
-                               add_fsevent(FSE_CREATE_FILE, &context,
-                                           FSE_ARG_STRING, len, target_path,
-                                           FSE_ARG_FINFO, &finfo,
-                                           FSE_ARG_DONE);
-                       }
-               }
-               release_pathbuff(target_path);
-       }
-out2:
-       /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
-        */
-       nameidone(&nd);
-out:
-       if (lvp)
-               vnode_put(lvp);
-       if (dvp)
-               vnode_put(dvp);
-       vnode_put(vp);
-       return (error);
+       return(error);
 }
 
 /*
- * Make a symbolic link.
- *
- * We could add support for ACLs here too...
+ * Get file system statistics in 64-bit mode
  */
-/* ARGSUSED */
 int
-symlink(struct proc *p, register struct symlink_args *uap, __unused register_t *retval)
+statfs64(__unused struct proc *p, struct statfs64_args *uap, __unused int32_t *retval)
 {
-       struct vnode_attr va;
-       char *path;
+       struct mount *mp;
+       struct vfsstatfs *sp;
        int error;
        struct nameidata nd;
-       struct vfs_context context;
-       vnode_t vp, dvp;
-       size_t dummy=0;
-       
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       MALLOC_ZONE(path, char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
-       error = copyinstr(uap->path, path, MAXPATHLEN, &dummy);
-       if (error)
-               goto out;
-       AUDIT_ARG(text, path);  /* This is the link string */
+       vfs_context_t ctxp = vfs_context_current();
+       vnode_t vp;
 
-       NDINIT(&nd, CREATE, LOCKPARENT | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->link, &context);
+       NDINIT(&nd, LOOKUP, OP_STATFS, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctxp);
        error = namei(&nd);
-       if (error)
-               goto out;
-       dvp = nd.ni_dvp;
+       if (error != 0)
+               return (error);
        vp = nd.ni_vp;
+       mp = vp->v_mount;
+       sp = &mp->mnt_vfsstat;
+       nameidone(&nd);
 
-       if (vp == NULL) {
-               VATTR_INIT(&va);
-               VATTR_SET(&va, va_type, VLNK);
-               VATTR_SET(&va, va_mode, ACCESSPERMS & ~p->p_fd->fd_cmask);
-
-               /* authorize */
-               error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, &context);
-               /* get default ownership, etc. */
-               if (error == 0)
-                       error = vnode_authattr_new(dvp, &va, 0, &context);
-               if (error == 0)
-                       error = VNOP_SYMLINK(dvp, &vp, &nd.ni_cnd, &va, path, &context);
-
-               /* do fallback attribute handling */
-               if (error == 0)
-                       error = vnode_setattr_fallback(vp, &va, &context);
-               
-               if (error == 0) {
-                       int     update_flags = 0;
-
-                       if (vp == NULL) {
-                               nd.ni_cnd.cn_nameiop = LOOKUP;
-                               nd.ni_cnd.cn_flags = 0;
-                               error = namei(&nd);
-                               vp = nd.ni_vp;
-
-                               if (vp == NULL)
-                                       goto skipit;
-                       }
-                       
-#if 0  /* XXX - kauth_todo - is KAUTH_FILEOP_SYMLINK needed? */
-                       /* call out to allow 3rd party notification of rename. 
-                        * Ignore result of kauth_authorize_fileop call.
-                        */
-                       if (kauth_authorize_fileop_has_listeners() &&
-                               namei(&nd) == 0) {
-                               char *new_link_path = NULL;
-                               int             len;
-                               
-                               /* build the path to the new link file */
-                               new_link_path = get_pathbuff();
-                               len = MAXPATHLEN;
-                               vn_getpath(dvp, new_link_path, &len);
-                               new_link_path[len - 1] = '/';
-                               strcpy(&new_link_path[len], nd.ni_cnd.cn_nameptr);
-
-                               kauth_authorize_fileop(vfs_context_ucred(&context), KAUTH_FILEOP_SYMLINK, 
-                                                                  (uintptr_t)path, (uintptr_t)new_link_path);
-                               if (new_link_path != NULL)
-                                       release_pathbuff(new_link_path);
-                       }
-#endif 
-                       // Make sure the name & parent pointers are hooked up
-                       if (vp->v_name == NULL)
-                               update_flags |= VNODE_UPDATE_NAME;
-                       if (vp->v_parent == NULLVP)
-                               update_flags |= VNODE_UPDATE_PARENT;
-
-                       if (update_flags)
-                               vnode_update_identity(vp, dvp, nd.ni_cnd.cn_nameptr, nd.ni_cnd.cn_namelen, nd.ni_cnd.cn_hash, update_flags);
-
-                       add_fsevent(FSE_CREATE_FILE, &context,
-                                   FSE_ARG_VNODE, vp,
-                                   FSE_ARG_DONE);
-               }
-       } else
-               error = EEXIST;
+#if CONFIG_MACF
+       error = mac_mount_check_stat(ctxp, mp);
+       if (error != 0)
+               return (error);
+#endif
 
-skipit:
-       /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
-        */
-       nameidone(&nd);
+       error = vfs_update_vfsstat(mp, ctxp, VFS_USER_EVENT);
+       if (error != 0) {
+               vnode_put(vp);
+               return (error);
+       }
 
-       if (vp)
-               vnode_put(vp);
-       vnode_put(dvp);
-out:
-       FREE_ZONE(path, MAXPATHLEN, M_NAMEI);
+       error = statfs64_common(mp, sp, uap->buf);
+       vnode_put(vp);
 
        return (error);
 }
 
 /*
- * Delete a whiteout from the filesystem.
+ * Get file system statistics in 64-bit mode
  */
-/* ARGSUSED */
-#warning XXX authorization not implmented for whiteouts
 int
-undelete(struct proc *p, register struct undelete_args *uap, __unused register_t *retval)
+fstatfs64(__unused struct proc *p, struct fstatfs64_args *uap, __unused int32_t *retval)
 {
+       struct vnode *vp;
+       struct mount *mp;
+       struct vfsstatfs *sp;
        int error;
-       struct nameidata nd;
-       struct vfs_context context;
-       vnode_t vp, dvp;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       AUDIT_ARG(fd, uap->fd);
 
-       NDINIT(&nd, DELETE, LOCKPARENT|DOWHITEOUT|AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
+       if ( (error = file_vnode(uap->fd, &vp)) )
                return (error);
-       dvp = nd.ni_dvp;
-       vp = nd.ni_vp;
 
-       if (vp == NULLVP && (nd.ni_cnd.cn_flags & ISWHITEOUT)) {
-               error = VNOP_WHITEOUT(dvp, &nd.ni_cnd, DELETE, &context);
-       } else
-               error = EEXIST;
+       error = vnode_getwithref(vp);
+       if (error) {
+               file_drop(uap->fd);
+               return (error);
+       }
 
-       /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
-        */
-       nameidone(&nd);
+       AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
 
-       if (vp)
-               vnode_put(vp);
-       vnode_put(dvp);
+       mp = vp->v_mount;
+       if (!mp) {
+               error = EBADF;
+               goto out;
+       }
+
+#if CONFIG_MACF
+       error = mac_mount_check_stat(vfs_context_current(), mp);
+       if (error != 0)
+               goto out;
+#endif
+
+       sp = &mp->mnt_vfsstat;
+       if ((error = vfs_update_vfsstat(mp, vfs_context_current(), VFS_USER_EVENT)) != 0) {
+               goto out;
+       }
+
+       error = statfs64_common(mp, sp, uap->buf);
+
+out:
+       file_drop(uap->fd);
+       vnode_put(vp);
 
        return (error);
 }
 
-/*
- * Delete a name from the filesystem.
- */
-/* ARGSUSED */
-static int
-_unlink(struct proc *p, struct unlink_args *uap, __unused register_t *retval, int nodelbusy)
-{
-       vnode_t vp, dvp;
-       int error;
-       struct nameidata nd;
-       struct vfs_context context;
-       struct componentname *cnp;
-       int flags = 0;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+struct getfsstat_struct {
+       user_addr_t     sfsp;
+       user_addr_t     *mp;
+       int             count;
+       int             maxcount;
+       int             flags;
+       int             error;
+};
 
-       NDINIT(&nd, DELETE, LOCKPARENT | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       cnp = &nd.ni_cnd;
 
-       /* With Carbon delete semantics, busy files cannot be deleted */
-       if (nodelbusy)
-               flags |= VNODE_REMOVE_NODELETEBUSY;
+static int
+getfsstat_callback(mount_t mp, void * arg)
+{
 
-       error = namei(&nd);
-       if (error)
-               return (error);
-       dvp = nd.ni_dvp;
-       vp = nd.ni_vp;
+       struct getfsstat_struct *fstp = (struct getfsstat_struct *)arg;
+       struct vfsstatfs *sp;
+       int error, my_size;
+       vfs_context_t ctx = vfs_context_current();
 
-       if (vp->v_type == VDIR) {
-               error = EPERM;  /* POSIX */
-       } else {
+       if (fstp->sfsp && fstp->count < fstp->maxcount) {
+#if CONFIG_MACF
+               error = mac_mount_check_stat(ctx, mp);
+               if (error != 0) {
+                       fstp->error = error;
+                       return(VFS_RETURNED_DONE);
+               }
+#endif
+               sp = &mp->mnt_vfsstat;
                /*
-                * The root of a mounted filesystem cannot be deleted.
+                * If MNT_NOWAIT is specified, do not refresh the
+                * fsstat cache. MNT_WAIT/MNT_DWAIT overrides MNT_NOWAIT.
                 */
-               if (vp->v_flag & VROOT) {
-                       error = EBUSY;
+               if (((fstp->flags & MNT_NOWAIT) == 0 || (fstp->flags & (MNT_WAIT | MNT_DWAIT))) &&
+                       (error = vfs_update_vfsstat(mp, ctx,
+                           VFS_USER_EVENT))) {
+                       KAUTH_DEBUG("vfs_update_vfsstat returned %d", error);
+                       return(VFS_RETURNED);
                }
-       }
-       /* authorize the delete operation */
-       if (!error)
-               error = vnode_authorize(vp, nd.ni_dvp, KAUTH_VNODE_DELETE, &context);
-       
-       if (!error) {
-               char     *path = NULL;
-               int       len;
-               fse_info  finfo;
 
-               if (need_fsevent(FSE_DELETE, dvp)) {
-                       path = get_pathbuff();
-                       len = MAXPATHLEN;
-                       vn_getpath(vp, path, &len);
-                       get_fse_info(vp, &finfo, &context);
+               /*
+                * Need to handle LP64 version of struct statfs
+                */
+               error = munge_statfs(mp, sp, fstp->sfsp, &my_size, IS_64BIT_PROCESS(vfs_context_proc(ctx)), FALSE);
+               if (error) {
+                       fstp->error = error;
+                       return(VFS_RETURNED_DONE);
                }
-               error = VNOP_REMOVE(dvp, vp, &nd.ni_cnd, flags, &context);
+               fstp->sfsp += my_size;
 
-               if ( !error && path != NULL) {
-                       add_fsevent(FSE_DELETE, &context,
-                                   FSE_ARG_STRING, len, path,
-                                   FSE_ARG_FINFO, &finfo,
-                                   FSE_ARG_DONE);
-               }
-               if (path != NULL)
-                       release_pathbuff(path);
+               if (fstp->mp) {
+#if CONFIG_MACF
+                       error = mac_mount_label_get(mp, *fstp->mp);
+                       if (error) {
+                               fstp->error = error;
+                               return(VFS_RETURNED_DONE);
+                       }
+#endif
+                       fstp->mp++;
+               }
        }
-       /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
-        */
-       nameidone(&nd);
-       vnode_put(dvp);
-       vnode_put(vp);
-       return (error);
+       fstp->count++;
+       return(VFS_RETURNED);
 }
 
 /*
- * Delete a name from the filesystem using POSIX semantics.
+ * Get statistics on all filesystems.
  */
 int
-unlink(p, uap, retval)
-       struct proc *p;
-       struct unlink_args *uap;
-       register_t *retval;
+getfsstat(__unused proc_t p, struct getfsstat_args *uap, int *retval)
 {
-       return _unlink(p, uap, retval, 0);
-}
+       struct __mac_getfsstat_args muap;
 
-/*
- * Delete a name from the filesystem using Carbon semantics.
- */
-int
-delete(p, uap, retval)
-       struct proc *p;
-       struct delete_args *uap;
-       register_t *retval;
-{
-       return _unlink(p, (struct unlink_args *)uap, retval, 1);
+       muap.buf = uap->buf;
+       muap.bufsize = uap->bufsize;
+       muap.mac = USER_ADDR_NULL;
+       muap.macsize = 0;
+       muap.flags = uap->flags;
+
+       return (__mac_getfsstat(p, &muap, retval));
 }
 
 /*
- * Reposition read/write file offset.
+ * __mac_getfsstat: Get MAC-related file system statistics
+ *
+ * Parameters:    p                        (ignored)
+ *                uap                      User argument descriptor (see below)
+ *                retval                   Count of file system statistics (N stats)
+ *
+ * Indirect:      uap->bufsize             Buffer size
+ *                uap->macsize             MAC info size
+ *                uap->buf                 Buffer where information will be returned
+ *                uap->mac                 MAC info
+ *                uap->flags               File system flags
+ *
+ *
+ * Returns:        0                       Success
+ *                !0                       Not success
+ *
  */
 int
-lseek(p, uap, retval)
-       struct proc *p;
-       register struct lseek_args *uap;
-       off_t *retval;
+__mac_getfsstat(__unused proc_t p, struct __mac_getfsstat_args *uap, int *retval)
 {
-       struct fileproc *fp;
-       struct vnode *vp;
-       struct vfs_context context;
-       off_t offset = uap->offset, file_size;
-       int error;
+       user_addr_t sfsp;
+       user_addr_t *mp;
+       size_t count, maxcount, bufsize, macsize;
+       struct getfsstat_struct fst;
 
-       if ( (error = fp_getfvp(p,uap->fd, &fp, &vp)) ) {
-               if (error == ENOTSUP)
-                       return (ESPIPE);
-               return (error);
+       bufsize = (size_t) uap->bufsize;
+       macsize = (size_t) uap->macsize;
+
+       if (IS_64BIT_PROCESS(p)) {
+               maxcount = bufsize / sizeof(struct user64_statfs);
        }
-       if (vnode_isfifo(vp)) {
-               file_drop(uap->fd);
-               return(ESPIPE);
+       else {
+               maxcount = bufsize / sizeof(struct user32_statfs);
        }
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
+       sfsp = uap->buf;
+       count = 0;
+
+       mp = NULL;
+
+#if CONFIG_MACF
+       if (uap->mac != USER_ADDR_NULL) {
+               u_int32_t *mp0;
+               int error;
+               unsigned int i;
+
+               count = (macsize / (IS_64BIT_PROCESS(p) ? 8 : 4));
+               if (count != maxcount)
+                       return (EINVAL);
+
+               /* Copy in the array */
+               MALLOC(mp0, u_int32_t *, macsize, M_MACTEMP, M_WAITOK);
+               if (mp0 == NULL) {
+                       return (ENOMEM);
+               }
+
+               error = copyin(uap->mac, mp0, macsize);
+               if (error) {
+                       FREE(mp0, M_MACTEMP);
+                       return (error);
+               }
+
+               /* Normalize to an array of user_addr_t */
+               MALLOC(mp, user_addr_t *, count * sizeof(user_addr_t), M_MACTEMP, M_WAITOK);
+               if (mp == NULL) {
+                       FREE(mp0, M_MACTEMP);
+                       return (ENOMEM);
+               }
+
+               for (i = 0; i < count; i++) {
+                       if (IS_64BIT_PROCESS(p))
+                               mp[i] = ((user_addr_t *)mp0)[i];
+                       else
+                               mp[i] = (user_addr_t)mp0[i];
+               }
+               FREE(mp0, M_MACTEMP);
        }
+#endif
 
-       switch (uap->whence) {
-       case L_INCR:
-               offset += fp->f_fglob->fg_offset;
-               break;
-       case L_XTND:
-               context.vc_proc = p;
-               context.vc_ucred = kauth_cred_get();
-               if ((error = vnode_size(vp, &file_size, &context)) != 0)
-                       break;
-               offset += file_size;
-               break;
-       case L_SET:
-               break;
-       default:
-               error = EINVAL;
-       }
-       if (error == 0) {
-               if (uap->offset > 0 && offset < 0) {
-                       /* Incremented/relative move past max size */
-                       error = EOVERFLOW;
-               } else {
-                       /*
-                        * Allow negative offsets on character devices, per
-                        * POSIX 1003.1-2001.  Most likely for writing disk
-                        * labels.
-                        */
-                       if (offset < 0 && vp->v_type != VCHR) {
-                               /* Decremented/relative move before start */
-                               error = EINVAL;
-                       } else {
-                               /* Success */
-                               fp->f_fglob->fg_offset = offset;
-                               *retval = fp->f_fglob->fg_offset;
-                       }
-               }
+
+       fst.sfsp = sfsp;
+       fst.mp = mp;
+       fst.flags = uap->flags;
+       fst.count = 0;
+       fst.error = 0;
+       fst.maxcount = maxcount;
+
+
+       vfs_iterate(0, getfsstat_callback, &fst);
+
+       if (mp)
+               FREE(mp, M_MACTEMP);
+
+       if (fst.error ) {
+               KAUTH_DEBUG("ERROR - %s gets %d", p->p_comm, fst.error);
+               return(fst.error);
        }
-       (void)vnode_put(vp);
-       file_drop(uap->fd);
-       return (error);
-}
 
+       if (fst.sfsp && fst.count > fst.maxcount)
+               *retval = fst.maxcount;
+       else
+               *retval = fst.count;
+       return (0);
+}
 
-/*
- * Check access permissions.
- */
 static int
-access1(vnode_t vp, vnode_t dvp, int uflags, vfs_context_t ctx)
+getfsstat64_callback(mount_t mp, void * arg)
 {
-       kauth_action_t action;
+       struct getfsstat_struct *fstp = (struct getfsstat_struct *)arg;
+       struct vfsstatfs *sp;
        int error;
 
-       /*
-        * If just the regular access bits, convert them to something
-        * that vnode_authorize will understand.
-        */
-       if (!(uflags & _ACCESS_EXTENDED_MASK)) {
-               action = 0;
-               if (uflags & R_OK)
-                       action |= KAUTH_VNODE_READ_DATA;        /* aka KAUTH_VNODE_LIST_DIRECTORY */
-               if (uflags & W_OK) {
-                       if (vnode_isdir(vp)) {
-                               action |= KAUTH_VNODE_ADD_FILE |
-                                   KAUTH_VNODE_ADD_SUBDIRECTORY;
-                               /* might want delete rights here too */
-                       } else {
-                               action |= KAUTH_VNODE_WRITE_DATA;
-                       }
+       if (fstp->sfsp && fstp->count < fstp->maxcount) {
+#if CONFIG_MACF
+               error = mac_mount_check_stat(vfs_context_current(), mp);
+               if (error != 0) {
+                       fstp->error = error;
+                       return(VFS_RETURNED_DONE);
                }
-               if (uflags & X_OK) {
-                       if (vnode_isdir(vp)) {
-                               action |= KAUTH_VNODE_SEARCH;
-                       } else {
-                               action |= KAUTH_VNODE_EXECUTE;
-                       }
+#endif
+               sp = &mp->mnt_vfsstat;
+               /*
+                * If MNT_NOWAIT is specified, do not refresh the fsstat
+                * cache. MNT_WAIT overrides MNT_NOWAIT.
+                *
+                * We treat MNT_DWAIT as MNT_WAIT for all instances of
+                * getfsstat, since the constants are out of the same
+                * namespace.
+                */
+               if (((fstp->flags & MNT_NOWAIT) == 0 ||
+                    (fstp->flags & (MNT_WAIT | MNT_DWAIT))) &&
+                   (error = vfs_update_vfsstat(mp, vfs_context_current(), VFS_USER_EVENT))) {
+                       KAUTH_DEBUG("vfs_update_vfsstat returned %d", error);
+                       return(VFS_RETURNED);
                }
-       } else {
-               /* take advantage of definition of uflags */
-               action = uflags >> 8;
+
+               error = statfs64_common(mp, sp, fstp->sfsp);
+               if (error) {
+                       fstp->error = error;
+                       return(VFS_RETURNED_DONE);
+               }
+               fstp->sfsp += sizeof(struct statfs64);
        }
-       
-       /* action == 0 means only check for existence */
-       if (action != 0) {
-               error = vnode_authorize(vp, dvp, action | KAUTH_VNODE_ACCESS, ctx);
-       } else {
-               error = 0;
+       fstp->count++;
+       return(VFS_RETURNED);
+}
+
+/*
+ * Get statistics on all file systems in 64 bit mode.
+ */
+int
+getfsstat64(__unused proc_t p, struct getfsstat64_args *uap, int *retval)
+{
+       user_addr_t sfsp;
+       int count, maxcount;
+       struct getfsstat_struct fst;
+
+       maxcount = uap->bufsize / sizeof(struct statfs64);
+
+       sfsp = uap->buf;
+       count = 0;
+
+       fst.sfsp = sfsp;
+       fst.flags = uap->flags;
+       fst.count = 0;
+       fst.error = 0;
+       fst.maxcount = maxcount;
+
+       vfs_iterate(0, getfsstat64_callback, &fst);
+
+       if (fst.error ) {
+               KAUTH_DEBUG("ERROR - %s gets %d", p->p_comm, fst.error);
+               return(fst.error);
        }
 
-       return(error);
+       if (fst.sfsp && fst.count > fst.maxcount)
+               *retval = fst.maxcount;
+       else
+               *retval = fst.count;
+
+       return (0);
 }
 
+/*
+ * gets the associated vnode with the file descriptor passed.
+ * as input
+ *
+ * INPUT
+ * ctx - vfs context of caller
+ * fd - file descriptor for which vnode is required.
+ * vpp - Pointer to pointer to vnode to be returned.
+ *
+ * The vnode is returned with an iocount so any vnode obtained
+ * by this call needs a vnode_put
+ *
+ */
+int
+vnode_getfromfd(vfs_context_t ctx, int fd, vnode_t *vpp)
+{
+       int error;
+       vnode_t vp;
+       struct fileproc *fp;
+       proc_t p = vfs_context_proc(ctx);
+
+       *vpp =  NULLVP;
+
+       error = fp_getfvp(p, fd, &fp, &vp);
+       if (error)
+               return (error);
+
+       error = vnode_getwithref(vp);
+       if (error) {
+               (void)fp_drop(p, fd, fp, 0);
+               return (error);
+       }
 
+       (void)fp_drop(p, fd, fp, 0);
+       *vpp = vp;
+       return (error);
+}
 
-/* XXX need to support the check-as uid argument */
+/*
+ * Wrapper function around namei to start lookup from a directory
+ * specified by a file descriptor ni_dirfd.
+ *
+ * In addition to all the errors returned by namei, this call can
+ * return ENOTDIR if the file descriptor does not refer to a directory.
+ * and EBADF if the file descriptor is not valid.
+ */
 int
-access_extended(__unused struct proc *p, struct access_extended_args *uap, __unused register_t *retval)
+nameiat(struct nameidata *ndp, int dirfd)
 {
-       struct accessx_descriptor *input;
-       errno_t *result;
-       int error, limit, nent, i, j, wantdelete;
-       struct vfs_context context;
-       struct nameidata nd;
-       int niopts;
-       vnode_t vp, dvp;
+       if ((dirfd != AT_FDCWD) &&
+           !(ndp->ni_flag & NAMEI_CONTLOOKUP) &&
+           !(ndp->ni_cnd.cn_flags & USEDVP)) {
+               int error = 0;
+               char c;
+
+               if (UIO_SEG_IS_USER_SPACE(ndp->ni_segflg)) {
+                       error = copyin(ndp->ni_dirp, &c, sizeof(char));
+                       if (error)
+                               return (error);
+               } else {
+                       c = *((char *)(ndp->ni_dirp));
+               }
 
-       input = NULL;
-       result = NULL;
-       error = 0;
-       vp = NULL;
-       dvp = NULL;
-       context.vc_ucred = NULL;
+               if (c != '/') {
+                       vnode_t dvp_at;
 
-       /* check input size and fetch descriptor array into allocated storage */
-       if (uap->size > ACCESSX_MAX_TABLESIZE)
-               return(ENOMEM);
-       if (uap->size < sizeof(struct accessx_descriptor))
-               return(EINVAL);
-       MALLOC(input, struct accessx_descriptor *, uap->size, M_TEMP, M_WAITOK);
-       if (input == NULL) {
-               error = ENOMEM;
-               goto out;
+                       error = vnode_getfromfd(ndp->ni_cnd.cn_context, dirfd,
+                           &dvp_at);
+                       if (error)
+                               return (error);
+
+                       if (vnode_vtype(dvp_at) != VDIR) {
+                               vnode_put(dvp_at);
+                               return (ENOTDIR);
+                       }
+
+                       ndp->ni_dvp = dvp_at;
+                       ndp->ni_cnd.cn_flags |= USEDVP;
+                       error = namei(ndp);
+                       ndp->ni_cnd.cn_flags &= ~USEDVP;
+                       vnode_put(dvp_at);
+                       return (error);
+               }
        }
-       error = copyin(uap->entries, input, uap->size);
-       if (error)
-               goto out;
 
-       /*
-        * Access is defined as checking against the process'
-        * real identity, even if operations are checking the
-        * effective identity.  So we need to tweak the credential
-        * in the context.
-        */
-       context.vc_ucred = kauth_cred_copy_real(kauth_cred_get());
-       context.vc_proc = current_proc();
+       return (namei(ndp));
+}
 
-       /*
-        * Find out how many entries we have, so we can allocate the result array.
-        */
-       limit = uap->size / sizeof(struct accessx_descriptor);
-       nent = limit;
-       wantdelete = 0;
-       for (i = 0; i < nent; i++) {
+/*
+ * Change current working directory to a given file descriptor.
+ */
+/* ARGSUSED */
+static int
+common_fchdir(proc_t p, struct fchdir_args *uap, int per_thread)
+{
+       struct filedesc *fdp = p->p_fd;
+       vnode_t vp;
+       vnode_t tdp;
+       vnode_t tvp;
+       struct mount *mp;
+       int error;
+       vfs_context_t ctx = vfs_context_current();
+
+       AUDIT_ARG(fd, uap->fd);
+       if (per_thread && uap->fd == -1) {
                /*
-                * Take the offset to the name string for this entry and convert to an
-                * input array index, which would be one off the end of the array if this
-                * was the lowest-addressed name string.
+                * Switching back from per-thread to per process CWD; verify we
+                * in fact have one before proceeding.  The only success case
+                * for this code path is to return 0 preemptively after zapping
+                * the thread structure contents.
                 */
-               j = input[i].ad_name_offset / sizeof(struct accessx_descriptor);
-               /* bad input */
-               if (j > limit) {
-                       error = EINVAL;
-                       goto out;
-               }
-               /* implicit reference to previous name, not a real offset */
-               if (j == 0) {
-                       /* first entry must have a name string */
-                       if (i == 0) {
-                               error = EINVAL;
-                               goto out;
+               thread_t th = vfs_context_thread(ctx);
+               if (th) {
+                       uthread_t uth = get_bsdthread_info(th);
+                       tvp = uth->uu_cdir;
+                       uth->uu_cdir = NULLVP;
+                       if (tvp != NULLVP) {
+                               vnode_rele(tvp);
+                               return (0);
                        }
-                       continue;
                }
-               if (j < nent)
-                       nent = j;
+               return (EBADF);
        }
-       if (nent > ACCESSX_MAX_DESCRIPTORS) {
-               error = ENOMEM;
+
+       if ( (error = file_vnode(uap->fd, &vp)) )
+               return(error);
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
+       }
+
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+
+       if (vp->v_type != VDIR) {
+               error = ENOTDIR;
                goto out;
        }
-       MALLOC(result, errno_t *, nent * sizeof(errno_t), M_TEMP, M_WAITOK);
-       if (result == NULL) {
-               error = ENOMEM;
+
+#if CONFIG_MACF
+       error = mac_vnode_check_chdir(ctx, vp);
+       if (error)
+               goto out;
+#endif
+       error = vnode_authorize(vp, NULL, KAUTH_VNODE_SEARCH, ctx);
+       if (error)
                goto out;
+
+       while (!error && (mp = vp->v_mountedhere) != NULL) {
+               if (vfs_busy(mp, LK_NOWAIT)) {
+                       error = EACCES;
+                       goto out;
+               }
+               error = VFS_ROOT(mp, &tdp, ctx);
+               vfs_unbusy(mp);
+               if (error)
+                       break;
+               vnode_put(vp);
+               vp = tdp;
        }
+       if (error)
+               goto out;
+       if ( (error = vnode_ref(vp)) )
+               goto out;
+       vnode_put(vp);
 
-       /*
-        * Do the work.
-        */
-       error = 0;
-       for (i = 0; i < nent; i++) {
-               /*
-                * Looking up a new name?
-                */
-               if (input[i].ad_name_offset != 0) {
-                       /* discard old vnodes */
-                       if (vp) {
-                               vnode_put(vp);
-                               vp = NULL;
-                       }
-                       if (dvp) {
-                               vnode_put(dvp);
-                               dvp = NULL;
-                       }
-                       
-                       /* scan forwards to see if we need the parent this time */
-                       wantdelete = input[i].ad_flags & _DELETE_OK;
-                       for (j = i + 1; (j < nent) && (input[j].ad_name_offset == 0); j++)
-                               if (input[j].ad_flags & _DELETE_OK)
-                                       wantdelete = 1;
-                       
-                       niopts = FOLLOW | AUDITVNPATH1;
-                       /* need parent for vnode_authorize for deletion test */
-                       if (wantdelete)
-                               niopts |= WANTPARENT;
-
-                       /* do the lookup */
-                       NDINIT(&nd, LOOKUP, niopts, UIO_SYSSPACE, CAST_USER_ADDR_T((const char *)input + input[i].ad_name_offset), &context);
-                       error = namei(&nd);
-                       if (!error) {
-                               vp = nd.ni_vp;
-                               if (wantdelete)
-                                       dvp = nd.ni_dvp;
-                       }
-                       nameidone(&nd);
-               }
-
-               /*
-                * Handle lookup errors.
-                */
-               switch(error) {
-               case ENOENT:
-               case EACCES:
-               case EPERM:
-               case ENOTDIR:
-                       result[i] = error;
-                       break;
-               case 0:
-                       /* run this access check */
-                       result[i] = access1(vp, dvp, input[i].ad_flags, &context);
-                       break;
-               default:
-                       /* fatal lookup error */
-
-                       goto out;
+       if (per_thread) {
+               thread_t th = vfs_context_thread(ctx);
+               if (th) {
+                       uthread_t uth = get_bsdthread_info(th);
+                       tvp = uth->uu_cdir;
+                       uth->uu_cdir = vp;
+                       OSBitOrAtomic(P_THCWD, &p->p_flag);
+               } else {
+                       vnode_rele(vp);
+                       return (ENOENT);
                }
+       } else {
+               proc_fdlock(p);
+               tvp = fdp->fd_cdir;
+               fdp->fd_cdir = vp;
+               proc_fdunlock(p);
        }
 
-       /* copy out results */
-       error = copyout(result, uap->results, nent * sizeof(errno_t));
-       
+       if (tvp)
+               vnode_rele(tvp);
+       file_drop(uap->fd);
+
+       return (0);
 out:
-       if (input)
-               FREE(input, M_TEMP);
-       if (result)
-               FREE(result, M_TEMP);
-       if (vp)
-               vnode_put(vp);
-       if (dvp)
-               vnode_put(dvp);
-       if (context.vc_ucred)
-               kauth_cred_rele(context.vc_ucred);
+       vnode_put(vp);
+       file_drop(uap->fd);
+
        return(error);
 }
 
 int
-access(__unused struct proc *p, register struct access_args *uap, __unused register_t *retval)
+fchdir(proc_t p, struct fchdir_args *uap, __unused int32_t *retval)
 {
-       int error;
-       struct nameidata nd;
-       int niopts;
-       struct vfs_context context;
-
-       /*
-        * Access is defined as checking against the process'
-        * real identity, even if operations are checking the
-        * effective identity.  So we need to tweak the credential
-        * in the context.
-        */
-       context.vc_ucred = kauth_cred_copy_real(kauth_cred_get());
-       context.vc_proc = current_proc();
-
-       niopts = FOLLOW | AUDITVNPATH1;
-       /* need parent for vnode_authorize for deletion test */
-       if (uap->flags & _DELETE_OK)
-               niopts |= WANTPARENT;
-       NDINIT(&nd, LOOKUP, niopts, UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               goto out;
-
-       error = access1(nd.ni_vp, nd.ni_dvp, uap->flags, &context);
-       
-       vnode_put(nd.ni_vp);
-       if (uap->flags & _DELETE_OK)
-               vnode_put(nd.ni_dvp);
-       nameidone(&nd);
-  
-out:
-       kauth_cred_rele(context.vc_ucred);
-       return(error);
+       return common_fchdir(p, uap, 0);
 }
 
+int
+__pthread_fchdir(proc_t p, struct __pthread_fchdir_args *uap, __unused int32_t *retval)
+{
+       return common_fchdir(p, (void *)uap, 1);
+}
 
+/*
+ * Change current working directory (".").
+ *
+ * Returns:    0                       Success
+ *     change_dir:ENOTDIR
+ *     change_dir:???
+ *     vnode_ref:ENOENT                No such file or directory
+ */
+/* ARGSUSED */
 static int
-stat2(vfs_context_t ctx, struct nameidata *ndp, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size)
+common_chdir(proc_t p, struct chdir_args *uap, int per_thread)
 {
-       struct stat sb;
-       struct user_stat user_sb;
-       caddr_t sbp;
-       int error, my_size;
-       kauth_filesec_t fsec;
-       size_t xsecurity_bufsize;
+       struct filedesc *fdp = p->p_fd;
+       int error;
+       struct nameidata nd;
+       vnode_t tvp;
+       vfs_context_t ctx = vfs_context_current();
 
-       error = namei(ndp);
+       NDINIT(&nd, LOOKUP, OP_CHDIR, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       error = change_dir(&nd, ctx);
        if (error)
                return (error);
-       fsec = KAUTH_FILESEC_NONE;
-       error = vn_stat(ndp->ni_vp, &sb, (xsecurity != USER_ADDR_NULL ? &fsec : NULL), ctx);
-       vnode_put(ndp->ni_vp);
-       nameidone(ndp);
-
-       if (error)
+       if ( (error = vnode_ref(nd.ni_vp)) ) {
+               vnode_put(nd.ni_vp);
                return (error);
-       /* Zap spare fields */
-       sb.st_lspare = 0;
-       sb.st_qspare[0] = 0LL;
-       sb.st_qspare[1] = 0LL;
-       if (IS_64BIT_PROCESS(vfs_context_proc(ctx))) {
-               munge_stat(&sb, &user_sb); 
-               my_size = sizeof(user_sb);
-               sbp = (caddr_t)&user_sb;
-       }
-       else {
-               my_size = sizeof(sb);
-               sbp = (caddr_t)&sb;
        }
-       if ((error = copyout(sbp, ub, my_size)) != 0)
-               goto out;
-
-       /* caller wants extended security information? */
-       if (xsecurity != USER_ADDR_NULL) {
+       /*
+        * drop the iocount we picked up in change_dir
+        */
+       vnode_put(nd.ni_vp);
 
-               /* did we get any? */
-               if (fsec == KAUTH_FILESEC_NONE) {
-                       if (susize(xsecurity_size, 0) != 0) {
-                               error = EFAULT;
-                               goto out;
-                       }
+       if (per_thread) {
+               thread_t th = vfs_context_thread(ctx);
+               if (th) {
+                       uthread_t uth = get_bsdthread_info(th);
+                       tvp = uth->uu_cdir;
+                       uth->uu_cdir = nd.ni_vp;
+                       OSBitOrAtomic(P_THCWD, &p->p_flag);
                } else {
-                       /* find the user buffer size */
-                       xsecurity_bufsize = fusize(xsecurity_size);
-
-                       /* copy out the actual data size */
-                       if (susize(xsecurity_size, KAUTH_FILESEC_COPYSIZE(fsec)) != 0) {
-                               error = EFAULT;
-                               goto out;
-                       }
-
-                       /* if the caller supplied enough room, copy out to it */
-                       if (xsecurity_bufsize >= KAUTH_FILESEC_COPYSIZE(fsec))
-                               error = copyout(fsec, xsecurity, KAUTH_FILESEC_COPYSIZE(fsec));
+                       vnode_rele(nd.ni_vp);
+                       return (ENOENT);
                }
+       } else {
+               proc_fdlock(p);
+               tvp = fdp->fd_cdir;
+               fdp->fd_cdir = nd.ni_vp;
+               proc_fdunlock(p);
        }
-out:
-       if (fsec != KAUTH_FILESEC_NONE)
-               kauth_filesec_free(fsec);
-       return (error);
-}
-
-/*
- * Get file status; this version follows links.
- */
-static int
-stat1(struct proc *p, user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size)
-{
-       struct nameidata nd;
-       struct vfs_context context;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       if (tvp)
+               vnode_rele(tvp);
 
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-           UIO_USERSPACE, path, &context);
-       return(stat2(&context, &nd, ub, xsecurity, xsecurity_size));
+       return (0);
 }
 
-int
-stat_extended(struct proc *p, struct stat_extended_args *uap, __unused register_t *retval)
-{
-       return (stat1(p, uap->path, uap->ub, uap->xsecurity, uap->xsecurity_size));
-}
 
+/*
+ * chdir
+ *
+ * Change current working directory (".") for the entire process
+ *
+ * Parameters:  p       Process requesting the call
+ *             uap     User argument descriptor (see below)
+ *             retval  (ignored)
+ *
+ * Indirect parameters:        uap->path       Directory path
+ *
+ * Returns:    0                       Success
+ *             common_chdir: ENOTDIR
+ *             common_chdir: ENOENT    No such file or directory
+ *             common_chdir: ???
+ *
+ */
 int
-stat(struct proc *p, struct stat_args *uap, __unused register_t *retval)
+chdir(proc_t p, struct chdir_args *uap, __unused int32_t *retval)
 {
-       return(stat1(p, uap->path, uap->ub, 0, 0));
+       return common_chdir(p, (void *)uap, 0);
 }
 
 /*
- * Get file status; this version does not follow links.
+ * __pthread_chdir
+ *
+ * Change current working directory (".") for a single thread
+ *
+ * Parameters:  p       Process requesting the call
+ *             uap     User argument descriptor (see below)
+ *             retval  (ignored)
+ *
+ * Indirect parameters:        uap->path       Directory path
+ *
+ * Returns:    0                       Success
+ *             common_chdir: ENOTDIR
+ *             common_chdir: ENOENT    No such file or directory
+ *             common_chdir: ???
+ *
  */
-static int
-lstat1(struct proc *p, user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size)
-{
-       struct nameidata nd;
-       struct vfs_context context;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       NDINIT(&nd, LOOKUP, NOFOLLOW | AUDITVNPATH1, 
-           UIO_USERSPACE, path, &context);
-
-       return(stat2(&context, &nd, ub, xsecurity, xsecurity_size));
-}
-
 int
-lstat_extended(struct proc *p, struct lstat_extended_args *uap, __unused register_t *retval)
+__pthread_chdir(proc_t p, struct __pthread_chdir_args *uap, __unused int32_t *retval)
 {
-       return (lstat1(p, uap->path, uap->ub, uap->xsecurity, uap->xsecurity_size));
+       return common_chdir(p, (void *)uap, 1);
 }
 
-int
-lstat(struct proc *p, struct lstat_args *uap, __unused register_t *retval)
-{
-       return(lstat1(p, uap->path, uap->ub, 0, 0));
-}
 
 /*
- * Get configurable pathname variables.
+ * Change notion of root (``/'') directory.
  */
 /* ARGSUSED */
 int
-pathconf(p, uap, retval)
-       struct proc *p;
-       register struct pathconf_args *uap;
-       register_t *retval;
+chroot(proc_t p, struct chroot_args *uap, __unused int32_t *retval)
 {
+       struct filedesc *fdp = p->p_fd;
        int error;
        struct nameidata nd;
-       struct vfs_context context;
+       vnode_t tvp;
+       vfs_context_t ctx = vfs_context_current();
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       if ((error = suser(kauth_cred_get(), &p->p_acflag)))
+               return (error);
 
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
+       NDINIT(&nd, LOOKUP, OP_CHROOT, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       error = change_dir(&nd, ctx);
        if (error)
                return (error);
 
-       error = vn_pathconf(nd.ni_vp, uap->name, retval, &context);
+#if CONFIG_MACF
+       error = mac_vnode_check_chroot(ctx, nd.ni_vp,
+           &nd.ni_cnd);
+       if (error) {
+               vnode_put(nd.ni_vp);
+               return (error);
+       }
+#endif
 
+       if ( (error = vnode_ref(nd.ni_vp)) ) {
+               vnode_put(nd.ni_vp);
+               return (error);
+       }
        vnode_put(nd.ni_vp);
-       nameidone(&nd);
-       return (error);
+
+       proc_fdlock(p);
+       tvp = fdp->fd_rdir;
+       fdp->fd_rdir = nd.ni_vp;
+       fdp->fd_flags |= FD_CHROOT;
+       proc_fdunlock(p);
+
+       if (tvp != NULL)
+               vnode_rele(tvp);
+
+       return (0);
 }
 
 /*
- * Return target name of a symbolic link.
+ * Common routine for chroot and chdir.
+ *
+ * Returns:    0                       Success
+ *             ENOTDIR                 Not a directory
+ *             namei:???               [anything namei can return]
+ *             vnode_authorize:???     [anything vnode_authorize can return]
  */
-/* ARGSUSED */
-int
-readlink(p, uap, retval)
-       struct proc *p;
-       register struct readlink_args *uap;
-       register_t *retval;
+static int
+change_dir(struct nameidata *ndp, vfs_context_t ctx)
 {
-       register struct vnode *vp;
-       uio_t auio;
-       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       vnode_t vp;
        int error;
-       struct nameidata nd;
-       struct vfs_context context;
-       char uio_buf[ UIO_SIZEOF(1) ];
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
 
-       NDINIT(&nd, LOOKUP, NOFOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
+       if ((error = namei(ndp)))
                return (error);
-       vp = nd.ni_vp;
+       nameidone(ndp);
+       vp = ndp->ni_vp;
 
-       nameidone(&nd);
+       if (vp->v_type != VDIR) {
+               vnode_put(vp);
+               return (ENOTDIR);
+       }
 
-       auio = uio_createwithbuffer(1, 0, spacetype, UIO_READ, 
-                                                                 &uio_buf[0], sizeof(uio_buf));
-       uio_addiov(auio, uap->buf, uap->count);
-       if (vp->v_type != VLNK)
-               error = EINVAL;
-       else {
-               error = vnode_authorize(vp, NULL, KAUTH_VNODE_READ_DATA, &context);
-               if (error == 0)
-                       error = VNOP_READLINK(vp, auio, &context);
+#if CONFIG_MACF
+       error = mac_vnode_check_chdir(ctx, vp);
+       if (error) {
+               vnode_put(vp);
+               return (error);
        }
-       vnode_put(vp);
-       // LP64todo - fix this
-       *retval = uap->count - (int)uio_resid(auio);
+#endif
+
+       error = vnode_authorize(vp, NULL, KAUTH_VNODE_SEARCH, ctx);
+       if (error) {
+               vnode_put(vp);
+               return (error);
+       }
+
        return (error);
 }
 
 /*
- * Change file flags.
+ * Free the vnode data (for directories) associated with the file glob.
  */
-static int
-chflags1(vnode_t vp, int flags, vfs_context_t ctx)
+struct fd_vn_data *
+fg_vn_data_alloc(void)
 {
-       struct vnode_attr va;
-       kauth_action_t action;
-       int error;
+       struct fd_vn_data *fvdata;
 
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_flags, flags);
+       /* Allocate per fd vnode data */
+       MALLOC(fvdata, struct fd_vn_data *, (sizeof(struct fd_vn_data)),
+              M_FD_VN_DATA, M_WAITOK | M_ZERO);
+       lck_mtx_init(&fvdata->fv_lock, fd_vn_lck_grp, fd_vn_lck_attr);
+       return fvdata;
+}
 
-       /* request authorisation, disregard immutability */
-       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0)
-               goto out;
-       /*
-        * Request that the auth layer disregard those file flags it's allowed to when
-        * authorizing this operation; we need to do this in order to be able to
-        * clear immutable flags.
-        */
-       if (action && ((error = vnode_authorize(vp, NULL, action | KAUTH_VNODE_NOIMMUTABLE, ctx)) != 0))
-               goto out;
-       error = vnode_setattr(vp, &va, ctx);
+/*
+ * Free the vnode data (for directories) associated with the file glob.
+ */
+void
+fg_vn_data_free(void *fgvndata)
+{
+       struct fd_vn_data *fvdata = (struct fd_vn_data *)fgvndata;
 
-out:
-       vnode_put(vp);
-       return(error);
+       if (fvdata->fv_buf)
+               FREE(fvdata->fv_buf, M_FD_DIRBUF);
+       lck_mtx_destroy(&fvdata->fv_lock, fd_vn_lck_grp);
+       FREE(fvdata, M_FD_VN_DATA);
 }
 
 /*
- * Change flags of a file given a path name.
+ * Check permissions, allocate an open file structure,
+ * and call the device open routine if any.
+ *
+ * Returns:    0                       Success
+ *             EINVAL
+ *             EINTR
+ *     falloc:ENFILE
+ *     falloc:EMFILE
+ *     falloc:ENOMEM
+ *     vn_open_auth:???
+ *     dupfdopen:???
+ *     VNOP_ADVLOCK:???
+ *     vnode_setsize:???
+ *
+ * XXX Need to implement uid, gid
  */
-/* ARGSUSED */
 int
-chflags(struct proc *p, register struct chflags_args *uap, __unused register_t *retval)
+open1(vfs_context_t ctx, struct nameidata *ndp, int uflags,
+    struct vnode_attr *vap, fp_allocfn_t fp_zalloc, void *cra,
+    int32_t *retval)
 {
-       register struct vnode *vp;
+       proc_t p = vfs_context_proc(ctx);
+       uthread_t uu = get_bsdthread_info(vfs_context_thread(ctx));
+       struct fileproc *fp;
+       vnode_t vp;
+       int flags, oflags;
+       int type, indx, error;
+       struct flock lf;
        struct vfs_context context;
-       int error;
-       struct nameidata nd;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       oflags = uflags;
 
-       AUDIT_ARG(fflags, uap->flags);
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               return (error);
-       vp = nd.ni_vp;
-       nameidone(&nd);
+       if ((oflags & O_ACCMODE) == O_ACCMODE)
+               return(EINVAL);
 
-       error = chflags1(vp, uap->flags, &context);
+       flags = FFLAGS(uflags);
+       CLR(flags, FENCRYPTED);
+       CLR(flags, FUNENCRYPTED);
 
-       return(error);
-}
+       AUDIT_ARG(fflags, oflags);
+       AUDIT_ARG(mode, vap->va_mode);
 
-/*
- * Change flags of a file given a file descriptor.
- */
-/* ARGSUSED */
-int
-fchflags(struct proc *p, register struct fchflags_args *uap, __unused register_t *retval)
-{
-       struct vfs_context context;
-       struct vnode *vp;
-       int error;
+       if ((error = falloc_withalloc(p,
+           &fp, &indx, ctx, fp_zalloc, cra)) != 0) {
+               return (error);
+       }
+       uu->uu_dupfd = -indx - 1;
 
-       AUDIT_ARG(fd, uap->fd);
-       AUDIT_ARG(fflags, uap->flags);
-       if ( (error = file_vnode(uap->fd, &vp)) )
+       if ((error = vn_open_auth(ndp, &flags, vap))) {
+               if ((error == ENODEV || error == ENXIO) && (uu->uu_dupfd >= 0)){        /* XXX from fdopen */
+                       if ((error = dupfdopen(p->p_fd, indx, uu->uu_dupfd, flags, error)) == 0) {
+                               fp_drop(p, indx, NULL, 0);
+                               *retval = indx;
+                               return (0);
+                       }
+               }
+               if (error == ERESTART)
+                       error = EINTR;
+               fp_free(p, indx, fp);
                return (error);
+       }
+       uu->uu_dupfd = 0;
+       vp = ndp->ni_vp;
 
-       if ((error = vnode_getwithref(vp))) {
-               file_drop(uap->fd);
-               return(error);
+       fp->f_fglob->fg_flag = flags & (FMASK | O_EVTONLY | FENCRYPTED | FUNENCRYPTED);
+       fp->f_fglob->fg_ops = &vnops;
+       fp->f_fglob->fg_data = (caddr_t)vp;
+
+       if (flags & (O_EXLOCK | O_SHLOCK)) {
+               lf.l_whence = SEEK_SET;
+               lf.l_start = 0;
+               lf.l_len = 0;
+               if (flags & O_EXLOCK)
+                       lf.l_type = F_WRLCK;
+               else
+                       lf.l_type = F_RDLCK;
+               type = F_FLOCK;
+               if ((flags & FNONBLOCK) == 0)
+                       type |= F_WAIT;
+#if CONFIG_MACF
+               error = mac_file_check_lock(vfs_context_ucred(ctx), fp->f_fglob,
+                   F_SETLK, &lf);
+               if (error)
+                       goto bad;
+#endif
+               if ((error = VNOP_ADVLOCK(vp, (caddr_t)fp->f_fglob, F_SETLK, &lf, type, ctx, NULL)))
+                       goto bad;
+               fp->f_fglob->fg_flag |= FHASLOCK;
        }
 
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+#if DEVELOPMENT || DEBUG
+       /*
+        * XXX VSWAP: Check for entitlements or special flag here
+        * so we can restrict access appropriately.
+        */
+#else /* DEVELOPMENT || DEBUG */
+
+       if (vnode_isswap(vp) && (flags & (FWRITE | O_TRUNC)) && (ctx != vfs_context_kernel())) {
+               /* block attempt to write/truncate swapfile */
+               error = EPERM;
+               goto bad;
+       }
+#endif /* DEVELOPMENT || DEBUG */
+
+       /* try to truncate by setting the size attribute */
+       if ((flags & O_TRUNC) && ((error = vnode_setsize(vp, (off_t)0, 0, ctx)) != 0))
+               goto bad;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       /*
+        * For directories we hold some additional information in the fd.
+        */
+       if (vnode_vtype(vp) == VDIR) {
+               fp->f_fglob->fg_vn_data = fg_vn_data_alloc();
+       } else {
+               fp->f_fglob->fg_vn_data = NULL;
+       }
 
-       error = chflags1(vp, uap->flags, &context);
+       vnode_put(vp);
+
+       /*
+        * The first terminal open (without a O_NOCTTY) by a session leader
+        * results in it being set as the controlling terminal.
+        */
+       if (vnode_istty(vp) && !(p->p_flag & P_CONTROLT) &&
+           !(flags & O_NOCTTY)) {
+               int tmp = 0;
+
+               (void)(*fp->f_fglob->fg_ops->fo_ioctl)(fp, (int)TIOCSCTTY,
+                   (caddr_t)&tmp, ctx);
+       }
+
+       proc_fdlock(p);
+       if (flags & O_CLOEXEC)
+               *fdflags(p, indx) |= UF_EXCLOSE;
+       if (flags & O_CLOFORK)
+               *fdflags(p, indx) |= UF_FORKCLOSE;
+       procfdtbl_releasefd(p, indx, NULL);
+
+#if CONFIG_SECLUDED_MEMORY
+       if (secluded_for_filecache &&
+           FILEGLOB_DTYPE(fp->f_fglob) == DTYPE_VNODE &&
+           vnode_vtype(vp) == VREG) {
+               memory_object_control_t moc;
+
+               moc = ubc_getobject(vp, UBC_FLAGS_NONE);
+
+               if (moc == MEMORY_OBJECT_CONTROL_NULL) {
+                       /* nothing to do... */
+               } else if (fp->f_fglob->fg_flag & FWRITE) {
+                       /* writable -> no longer  eligible for secluded pages */
+                       memory_object_mark_eligible_for_secluded(moc,
+                                                                FALSE);
+               } else if (secluded_for_filecache == 1) {
+                       char pathname[32] = { 0, };
+                       size_t copied;
+                       /* XXX FBDP: better way to detect /Applications/ ? */
+                       if (UIO_SEG_IS_USER_SPACE(ndp->ni_segflg)) {
+                               copyinstr(ndp->ni_dirp,
+                                         pathname,
+                                         sizeof (pathname),
+                                         &copied);
+                       } else {
+                               copystr(CAST_DOWN(void *, ndp->ni_dirp),
+                                       pathname,
+                                       sizeof (pathname),
+                                       &copied);
+                       }
+                       pathname[sizeof (pathname) - 1] = '\0';
+                       if (strncmp(pathname,
+                                   "/Applications/",
+                                   strlen("/Applications/")) == 0 &&
+                           strncmp(pathname,
+                                   "/Applications/Camera.app/",
+                                   strlen("/Applications/Camera.app/")) != 0) {
+                               /*
+                                * not writable
+                                * AND from "/Applications/"
+                                * AND not from "/Applications/Camera.app/"
+                                * ==> eligible for secluded
+                                */
+                               memory_object_mark_eligible_for_secluded(moc,
+                                                                        TRUE);
+                       }
+               } else if (secluded_for_filecache == 2) {
+#if __arm64__
+#define DYLD_SHARED_CACHE_NAME "dyld_shared_cache_arm64"
+#elif __arm__
+#define DYLD_SHARED_CACHE_NAME "dyld_shared_cache_armv7"
+#else
+/* not implemented... */
+#endif
+                       if (!strncmp(vp->v_name,
+                                    DYLD_SHARED_CACHE_NAME,
+                                    strlen(DYLD_SHARED_CACHE_NAME)) ||
+                           !strncmp(vp->v_name,
+                                    "dyld",
+                                    strlen(vp->v_name)) ||
+                           !strncmp(vp->v_name,
+                                    "launchd",
+                                    strlen(vp->v_name)) ||
+                           !strncmp(vp->v_name,
+                                    "Camera",
+                                    strlen(vp->v_name)) ||
+                           !strncmp(vp->v_name,
+                                    "mediaserverd",
+                                    strlen(vp->v_name)) || 
+                           !strncmp(vp->v_name,
+                                    "SpringBoard",
+                                    strlen(vp->v_name)) || 
+                           !strncmp(vp->v_name,
+                                    "backboardd",
+                                    strlen(vp->v_name))) {
+                               /*
+                                * This file matters when launching Camera:
+                                * do not store its contents in the secluded
+                                * pool that will be drained on Camera launch.
+                                */
+                               memory_object_mark_eligible_for_secluded(moc,
+                                                                        FALSE);
+                       }
+               }
+       }
+#endif /* CONFIG_SECLUDED_MEMORY */
+
+       fp_drop(p, indx, fp, 1);
+       proc_fdunlock(p);
+
+       *retval = indx;
+
+       return (0);
+bad:
+       context = *vfs_context_current();
+       context.vc_ucred = fp->f_fglob->fg_cred;
+
+       if ((fp->f_fglob->fg_flag & FHASLOCK) &&
+           (FILEGLOB_DTYPE(fp->f_fglob) == DTYPE_VNODE)) {
+               lf.l_whence = SEEK_SET;
+               lf.l_start = 0;
+               lf.l_len = 0;
+               lf.l_type = F_UNLCK;
+
+               (void)VNOP_ADVLOCK(
+                       vp, (caddr_t)fp->f_fglob, F_UNLCK, &lf, F_FLOCK, ctx, NULL);
+       }
+
+       vn_close(vp, fp->f_fglob->fg_flag, &context);
+       vnode_put(vp);
+       fp_free(p, indx, fp);
 
-       file_drop(uap->fd);
        return (error);
 }
 
 /*
- * Change security information on a filesystem object.
+ * While most of the *at syscall handlers can call nameiat() which
+ * is a wrapper around namei, the use of namei and initialisation
+ * of nameidata are far removed and in different functions  - namei
+ * gets called in vn_open_auth for open1. So we'll just do here what
+ * nameiat() does.
  */
 static int
-chmod2(vfs_context_t ctx, struct vnode *vp, struct vnode_attr *vap)
+open1at(vfs_context_t ctx, struct nameidata *ndp, int uflags,
+    struct vnode_attr *vap, fp_allocfn_t fp_zalloc, void *cra, int32_t *retval,
+    int dirfd)
 {
-       kauth_action_t action;
-       int error;
-       
-       AUDIT_ARG(mode, (mode_t)vap->va_mode);
-#warning XXX audit new args
+       if ((dirfd != AT_FDCWD) && !(ndp->ni_cnd.cn_flags & USEDVP)) {
+               int error;
+               char c;
 
-       /* make sure that the caller is allowed to set this security information */
-       if (((error = vnode_authattr(vp, vap, &action, ctx)) != 0) ||
-           ((error = vnode_authorize(vp, NULL, action, ctx)) != 0)) {
-               if (error == EACCES)
-                       error = EPERM;
-               return(error);
+               if (UIO_SEG_IS_USER_SPACE(ndp->ni_segflg)) {
+                       error = copyin(ndp->ni_dirp, &c, sizeof(char));
+                       if (error)
+                               return (error);
+               } else {
+                       c = *((char *)(ndp->ni_dirp));
+               }
+
+               if (c != '/') {
+                       vnode_t dvp_at;
+
+                       error = vnode_getfromfd(ndp->ni_cnd.cn_context, dirfd,
+                           &dvp_at);
+                       if (error)
+                               return (error);
+
+                       if (vnode_vtype(dvp_at) != VDIR) {
+                               vnode_put(dvp_at);
+                               return (ENOTDIR);
+                       }
+
+                       ndp->ni_dvp = dvp_at;
+                       ndp->ni_cnd.cn_flags |= USEDVP;
+                       error = open1(ctx, ndp, uflags, vap, fp_zalloc, cra,
+                           retval);
+                       vnode_put(dvp_at);
+                       return (error);
+               }
        }
-       
-       error = vnode_setattr(vp, vap, ctx);
 
-       return (error);
+       return (open1(ctx, ndp, uflags, vap, fp_zalloc, cra, retval));
 }
 
-
 /*
- * Change mode of a file given path name.
+ * open_extended: open a file given a path name; with extended argument list (including extended security (ACL)).
+ *
+ * Parameters: p                       Process requesting the open
+ *             uap                     User argument descriptor (see below)
+ *             retval                  Pointer to an area to receive the
+ *                                     return calue from the system call
+ *
+ * Indirect:   uap->path               Path to open (same as 'open')
+ *             uap->flags              Flags to open (same as 'open'
+ *             uap->uid                UID to set, if creating
+ *             uap->gid                GID to set, if creating
+ *             uap->mode               File mode, if creating (same as 'open')
+ *             uap->xsecurity          ACL to set, if creating
+ *
+ * Returns:    0                       Success
+ *             !0                      errno value
+ *
+ * Notes:      The kauth_filesec_t in 'va', if any, is in host byte order.
+ *
+ * XXX:                We should enummerate the possible errno values here, and where
+ *             in the code they originated.
  */
-static int
-chmod1(vfs_context_t ctx, user_addr_t path, struct vnode_attr *vap)
+int
+open_extended(proc_t p, struct open_extended_args *uap, int32_t *retval)
 {
+       struct filedesc *fdp = p->p_fd;
+       int ciferror;
+       kauth_filesec_t xsecdst;
+       struct vnode_attr va;
        struct nameidata nd;
-       int error;
+       int cmode;
 
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, path, ctx);
-       if ((error = namei(&nd)))
-               return (error);
-       error = chmod2(ctx, nd.ni_vp, vap);
-       vnode_put(nd.ni_vp);
-       nameidone(&nd);
-       return(error);
-}
+       AUDIT_ARG(owner, uap->uid, uap->gid);
 
-int
-chmod_extended(struct proc *p, struct chmod_extended_args *uap, __unused register_t *retval)
-{
-       struct vfs_context context;
-       int error;
-       struct vnode_attr va;
-       kauth_filesec_t xsecdst;
+       xsecdst = NULL;
+       if ((uap->xsecurity != USER_ADDR_NULL) &&
+           ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0))
+               return ciferror;
 
        VATTR_INIT(&va);
-       if (uap->mode != -1)
-               VATTR_SET(&va, va_mode, uap->mode & ALLPERMS);
+       cmode = ((uap->mode &~ fdp->fd_cmask) & ALLPERMS) & ~S_ISTXT;
+       VATTR_SET(&va, va_mode, cmode);
        if (uap->uid != KAUTH_UID_NONE)
                VATTR_SET(&va, va_uid, uap->uid);
        if (uap->gid != KAUTH_GID_NONE)
                VATTR_SET(&va, va_gid, uap->gid);
-
-       xsecdst = NULL;
-       switch(uap->xsecurity) {
-               /* explicit remove request */
-       case CAST_USER_ADDR_T((void *)1):       /* _FILESEC_REMOVE_ACL */
-               VATTR_SET(&va, va_acl, NULL);
-               break;
-               /* not being set */
-       case USER_ADDR_NULL:
-               break;
-       default:
-               if ((error = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
-                       return(error);
+       if (xsecdst != NULL)
                VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
-               KAUTH_DEBUG("CHMOD - setting ACL with %d entries", va.va_acl->acl_entrycount);
-       }
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
 
-       error = chmod1(&context, uap->path, &va);
+       NDINIT(&nd, LOOKUP, OP_OPEN, FOLLOW | AUDITVNPATH1, UIO_USERSPACE,
+              uap->path, vfs_context_current());
 
+       ciferror = open1(vfs_context_current(), &nd, uap->flags, &va,
+                        fileproc_alloc_init, NULL, retval);
        if (xsecdst != NULL)
                kauth_filesec_free(xsecdst);
-       return(error);
+
+       return ciferror;
 }
 
-int
-chmod(struct proc *p, register struct chmod_args *uap, __unused register_t *retval)
-{
-       struct vfs_context context;
+/*
+ * Go through the data-protected atomically controlled open (2)
+ *
+ * int open_dprotected_np(user_addr_t path, int flags, int class, int dpflags, int mode)
+ */
+int open_dprotected_np (__unused proc_t p, struct open_dprotected_np_args *uap, int32_t *retval) {
+       int flags = uap->flags;
+       int class = uap->class;
+       int dpflags = uap->dpflags;
+
+       /*
+        * Follow the same path as normal open(2)
+        * Look up the item if it exists, and acquire the vnode.
+        */
+       struct filedesc *fdp = p->p_fd;
        struct vnode_attr va;
+       struct nameidata nd;
+       int cmode;
+       int error;
 
        VATTR_INIT(&va);
-       VATTR_SET(&va, va_mode, uap->mode & ALLPERMS);
+       /* Mask off all but regular access permissions */
+       cmode = ((uap->mode &~ fdp->fd_cmask) & ALLPERMS) & ~S_ISTXT;
+       VATTR_SET(&va, va_mode, cmode & ACCESSPERMS);
+
+       NDINIT(&nd, LOOKUP, OP_OPEN, FOLLOW | AUDITVNPATH1, UIO_USERSPACE,
+              uap->path, vfs_context_current());
+
+       /*
+        * Initialize the extra fields in vnode_attr to pass down our
+        * extra fields.
+        * 1. target cprotect class.
+        * 2. set a flag to mark it as requiring open-raw-encrypted semantics.
+        */
+       if (flags & O_CREAT) {
+               /* lower level kernel code validates that the class is valid before applying it. */
+               if (class != PROTECTION_CLASS_DEFAULT) {
+                       /*
+                        * PROTECTION_CLASS_DEFAULT implies that we make the class for this
+                        * file behave the same as open (2)
+                        */
+                       VATTR_SET(&va, va_dataprotect_class, class);
+               }
+       }
+
+       if (dpflags & (O_DP_GETRAWENCRYPTED|O_DP_GETRAWUNENCRYPTED)) {
+               if ( flags & (O_RDWR | O_WRONLY)) {
+                       /* Not allowed to write raw encrypted bytes */
+                       return EINVAL;
+               }
+               if (uap->dpflags & O_DP_GETRAWENCRYPTED) {
+                   VATTR_SET(&va, va_dataprotect_flags, VA_DP_RAWENCRYPTED);
+               }
+               if (uap->dpflags & O_DP_GETRAWUNENCRYPTED) {
+                   VATTR_SET(&va, va_dataprotect_flags, VA_DP_RAWUNENCRYPTED);
+               }
+       }
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       error = open1(vfs_context_current(), &nd, uap->flags, &va,
+                     fileproc_alloc_init, NULL, retval);
 
-       return(chmod1(&context, uap->path, &va));
+       return error;
 }
 
-/*
- * Change mode of a file given a file descriptor.
- */
 static int
-fchmod1(struct proc *p, int fd, struct vnode_attr *vap)
+openat_internal(vfs_context_t ctx, user_addr_t path, int flags, int mode,
+    int fd, enum uio_seg segflg, int *retval)
 {
-       struct vnode *vp;
-       int error;
-       struct vfs_context context;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       struct filedesc *fdp = (vfs_context_proc(ctx))->p_fd;
+       struct vnode_attr va;
+       struct nameidata nd;
+       int cmode;
 
-       AUDIT_ARG(fd, fd);
+       VATTR_INIT(&va);
+       /* Mask off all but regular access permissions */
+       cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) & ~S_ISTXT;
+       VATTR_SET(&va, va_mode, cmode & ACCESSPERMS);
 
-       if ((error = file_vnode(fd, &vp)) != 0)
-               return (error);
-       if ((error = vnode_getwithref(vp)) != 0) {
-               file_drop(fd);
-               return(error);
-       }
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+       NDINIT(&nd, LOOKUP, OP_OPEN, FOLLOW | AUDITVNPATH1,
+           segflg, path, ctx);
 
-       error = chmod2(&context, vp, vap);
-       (void)vnode_put(vp);
-       file_drop(fd);
+       return (open1at(ctx, &nd, flags, &va, fileproc_alloc_init, NULL,
+           retval, fd));
+}
 
-       return (error);
+int
+open(proc_t p, struct open_args *uap, int32_t *retval)
+{
+       __pthread_testcancel(1);
+       return(open_nocancel(p, (struct open_nocancel_args *)uap, retval));
+}
+
+int
+open_nocancel(__unused proc_t p, struct open_nocancel_args *uap,
+    int32_t *retval)
+{
+       return (openat_internal(vfs_context_current(), uap->path, uap->flags,
+           uap->mode, AT_FDCWD, UIO_USERSPACE, retval));
+}
+
+int
+openat_nocancel(__unused proc_t p, struct openat_nocancel_args *uap,
+                int32_t *retval)
+{
+       return (openat_internal(vfs_context_current(), uap->path, uap->flags,
+           uap->mode, uap->fd, UIO_USERSPACE, retval));
+}
+
+int
+openat(proc_t p, struct openat_args *uap, int32_t *retval)
+{
+       __pthread_testcancel(1);
+       return(openat_nocancel(p, (struct openat_nocancel_args *)uap, retval));
 }
 
+/*
+ * openbyid_np: open a file given a file system id and a file system object id
+ *     the hfs file system object id is an fsobj_id_t {uint32, uint32}
+ *     file systems that don't support object ids it is a node id (uint64_t).
+ *
+ * Parameters: p                       Process requesting the open
+ *             uap                     User argument descriptor (see below)
+ *             retval                  Pointer to an area to receive the
+ *                                     return calue from the system call
+ *
+ * Indirect:   uap->path               Path to open (same as 'open')
+ *
+ *             uap->fsid               id of target file system
+ *             uap->objid              id of target file system object
+ *             uap->flags              Flags to open (same as 'open')
+ *
+ * Returns:    0                       Success
+ *             !0                      errno value
+ *
+ *
+ * XXX:                We should enummerate the possible errno values here, and where
+ *             in the code they originated.
+ */
 int
-fchmod_extended(struct proc *p, struct fchmod_extended_args *uap, __unused register_t *retval)
+openbyid_np(__unused proc_t p, struct openbyid_np_args *uap, int *retval)
 {
+       fsid_t fsid;
+       uint64_t objid;
        int error;
-       struct vnode_attr va;
-       kauth_filesec_t xsecdst;
+       char *buf = NULL;
+       int buflen = MAXPATHLEN;
+       int pathlen = 0;
+       vfs_context_t ctx = vfs_context_current();
 
-       VATTR_INIT(&va);
-       if (uap->mode != -1)
-               VATTR_SET(&va, va_mode, uap->mode & ALLPERMS);
-       if (uap->uid != KAUTH_UID_NONE)
-               VATTR_SET(&va, va_uid, uap->uid);
-       if (uap->gid != KAUTH_GID_NONE)
-               VATTR_SET(&va, va_gid, uap->gid);
+       if ((error = priv_check_cred(vfs_context_ucred(ctx), PRIV_VFS_OPEN_BY_ID, 0))) {
+               return (error);
+       }
 
-       xsecdst = NULL;
-       switch(uap->xsecurity) {
-       case USER_ADDR_NULL:
-               VATTR_SET(&va, va_acl, NULL);
-               break;
-       case CAST_USER_ADDR_T(-1):
-               break;
-       default:
-               if ((error = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
-                       return(error);
-               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
+       if ((error = copyin(uap->fsid, (caddr_t)&fsid, sizeof(fsid)))) {
+               return (error);
        }
 
-       error = fchmod1(p, uap->fd, &va);
+       /*uap->obj is an fsobj_id_t defined as struct {uint32_t, uint32_t} */
+       if ((error = copyin(uap->objid, (caddr_t)&objid, sizeof(uint64_t)))) {
+               return (error);
+       }
 
-       
-       switch(uap->xsecurity) {
-       case USER_ADDR_NULL:
-       case CAST_USER_ADDR_T(-1):
-               break;
-       default:
-               if (xsecdst != NULL)
-                       kauth_filesec_free(xsecdst);
+       AUDIT_ARG(value32, fsid.val[0]);
+       AUDIT_ARG(value64, objid);
+
+       /*resolve path from fsis, objid*/
+       do {
+               MALLOC(buf, char *, buflen + 1, M_TEMP, M_WAITOK);
+               if (buf == NULL) {
+                       return (ENOMEM);
+               }
+
+               error = fsgetpath_internal(
+                       ctx, fsid.val[0], objid,
+                       buflen, buf, &pathlen);
+
+               if (error) {
+                       FREE(buf, M_TEMP);
+                       buf = NULL;
+               }
+       } while (error == ENOSPC && (buflen += MAXPATHLEN));
+
+       if (error) {
+               return error;
        }
-       return(error);
-}
 
-int
-fchmod(struct proc *p, register struct fchmod_args *uap, __unused register_t *retval)
-{
-       struct vnode_attr va;
+       buf[pathlen] = 0;
 
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_mode, uap->mode & ALLPERMS);
+       error = openat_internal(
+               ctx, (user_addr_t)buf, uap->oflags, 0, AT_FDCWD, UIO_SYSSPACE, retval);
 
-       return(fchmod1(p, uap->fd, &va));
+       FREE(buf, M_TEMP);
+
+       return error;
 }
 
 
 /*
- * Set ownership given a path name.
+ * Create a special file.
  */
-/* ARGSUSED */
-static int
-chown1(vfs_context_t ctx, register struct chown_args *uap, __unused register_t *retval, int follow)
+static int mkfifo1(vfs_context_t ctx, user_addr_t upath, struct vnode_attr *vap);
+
+int
+mknod(proc_t p, struct mknod_args *uap, __unused int32_t *retval)
 {
-       register struct vnode *vp;
        struct vnode_attr va;
+       vfs_context_t ctx = vfs_context_current();
        int error;
        struct nameidata nd;
-       kauth_action_t action;
+       vnode_t vp, dvp;
 
-       AUDIT_ARG(owner, uap->uid, uap->gid);
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_mode, (uap->mode & ALLPERMS) & ~p->p_fd->fd_cmask);
+       VATTR_SET(&va, va_rdev, uap->dev);
+
+       /* If it's a mknod() of a FIFO, call mkfifo1() instead */
+       if ((uap->mode & S_IFMT) == S_IFIFO)
+               return(mkfifo1(ctx, uap->path, &va));
 
-       NDINIT(&nd, LOOKUP, (follow ? FOLLOW : 0) | AUDITVNPATH1, 
+       AUDIT_ARG(mode, uap->mode);
+       AUDIT_ARG(value32, uap->dev);
+
+       if ((error = suser(vfs_context_ucred(ctx), &p->p_acflag)))
+               return (error);
+       NDINIT(&nd, CREATE, OP_MKNOD, LOCKPARENT | AUDITVNPATH1,
                UIO_USERSPACE, uap->path, ctx);
        error = namei(&nd);
        if (error)
                return (error);
+       dvp = nd.ni_dvp;
        vp = nd.ni_vp;
 
-       nameidone(&nd);
+       if (vp != NULL) {
+               error = EEXIST;
+               goto out;
+       }
 
-       /*
-        * XXX A TEMPORARY HACK FOR NOW: Try to track console_user
-        * by looking for chown() calls on /dev/console from a console process.
-        */
-       if ((vp) && (vp->v_type == VBLK || vp->v_type == VCHR) && (vp->v_specinfo) &&
-               (major(vp->v_specinfo->si_rdev) == CONSMAJOR) &&
-               (minor(vp->v_specinfo->si_rdev) == 0)) {
-               console_user = uap->uid;
-       };
-       VATTR_INIT(&va);
-       if (uap->uid != VNOVAL)
-               VATTR_SET(&va, va_uid, uap->uid);
-       if (uap->gid != VNOVAL)
-               VATTR_SET(&va, va_gid, uap->gid);
+       switch (uap->mode & S_IFMT) {
+       case S_IFCHR:
+               VATTR_SET(&va, va_type, VCHR);
+               break;
+       case S_IFBLK:
+               VATTR_SET(&va, va_type, VBLK);
+               break;
+       default:
+               error = EINVAL;
+               goto out;
+       }
 
-       /* preflight and authorize attribute changes */
-       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0)
+#if CONFIG_MACF
+       error = mac_vnode_check_create(ctx,
+           nd.ni_dvp, &nd.ni_cnd, &va);
+       if (error)
                goto out;
-       if (action && ((error = vnode_authorize(vp, NULL, action, ctx)) != 0))
+#endif
+
+       if ((error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, ctx)) != 0)
+               goto out;
+
+       if ((error = vn_create(dvp, &vp, &nd, &va, 0, 0, NULL, ctx)) != 0)
                goto out;
-       error = vnode_setattr(vp, &va, ctx);
+
+       if (vp) {
+               int     update_flags = 0;
+
+               // Make sure the name & parent pointers are hooked up
+               if (vp->v_name == NULL)
+                       update_flags |= VNODE_UPDATE_NAME;
+               if (vp->v_parent == NULLVP)
+                       update_flags |= VNODE_UPDATE_PARENT;
+
+               if (update_flags)
+                       vnode_update_identity(vp, dvp, nd.ni_cnd.cn_nameptr, nd.ni_cnd.cn_namelen, nd.ni_cnd.cn_hash, update_flags);
+
+#if CONFIG_FSE
+               add_fsevent(FSE_CREATE_FILE, ctx,
+                   FSE_ARG_VNODE, vp,
+                   FSE_ARG_DONE);
+#endif
+       }
+
 out:
        /*
-        * EACCES is only allowed from namei(); permissions failure should
-        * return EPERM, so we need to translate the error code.
+        * nameidone has to happen before we vnode_put(dvp)
+        * since it may need to release the fs_nodelock on the dvp
         */
-       if (error == EACCES)
-               error = EPERM;
-       
-       vnode_put(vp);
+       nameidone(&nd);
+
+       if (vp)
+               vnode_put(vp);
+       vnode_put(dvp);
+
        return (error);
 }
 
-int
-chown(struct proc *p, register struct chown_args *uap, register_t *retval)
+/*
+ * Create a named pipe.
+ *
+ * Returns:    0                       Success
+ *             EEXIST
+ *     namei:???
+ *     vnode_authorize:???
+ *     vn_create:???
+ */
+static int
+mkfifo1(vfs_context_t ctx, user_addr_t upath, struct vnode_attr *vap)
 {
-       struct vfs_context context;
+       vnode_t vp, dvp;
+       int error;
+       struct nameidata nd;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       NDINIT(&nd, CREATE, OP_MKFIFO, LOCKPARENT | AUDITVNPATH1,
+               UIO_USERSPACE, upath, ctx);
+       error = namei(&nd);
+       if (error)
+               return (error);
+       dvp = nd.ni_dvp;
+       vp = nd.ni_vp;
 
-       return chown1(&context, uap, retval, 1);
-}
+       /* check that this is a new file and authorize addition */
+       if (vp != NULL) {
+               error = EEXIST;
+               goto out;
+       }
+       VATTR_SET(vap, va_type, VFIFO);
 
-int
-lchown(struct proc *p, register struct lchown_args *uap, register_t *retval)
-{
-       struct vfs_context context;
+       if ((error = vn_authorize_create(dvp, &nd.ni_cnd, vap, ctx, NULL)) != 0)
+               goto out;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       error = vn_create(dvp, &vp, &nd, vap, 0, 0, NULL, ctx);
+out:
+       /*
+        * nameidone has to happen before we vnode_put(dvp)
+        * since it may need to release the fs_nodelock on the dvp
+        */
+       nameidone(&nd);
+
+       if (vp)
+               vnode_put(vp);
+       vnode_put(dvp);
 
-       /* Argument list identical, but machine generated; cast for chown1() */
-       return chown1(&context, (struct chown_args *)uap, retval, 0);
+       return error;
 }
 
+
 /*
- * Set ownership given a file descriptor.
+ * mkfifo_extended: Create a named pipe; with extended argument list (including extended security (ACL)).
+ *
+ * Parameters: p                       Process requesting the open
+ *             uap                     User argument descriptor (see below)
+ *             retval                  (Ignored)
+ *
+ * Indirect:   uap->path               Path to fifo (same as 'mkfifo')
+ *             uap->uid                UID to set
+ *             uap->gid                GID to set
+ *             uap->mode               File mode to set (same as 'mkfifo')
+ *             uap->xsecurity          ACL to set, if creating
+ *
+ * Returns:    0                       Success
+ *             !0                      errno value
+ *
+ * Notes:      The kauth_filesec_t in 'va', if any, is in host byte order.
+ *
+ * XXX:                We should enummerate the possible errno values here, and where
+ *             in the code they originated.
  */
-/* ARGSUSED */
 int
-fchown(struct proc *p, register struct fchown_args *uap, __unused register_t *retval)
+mkfifo_extended(proc_t p, struct mkfifo_extended_args *uap, __unused int32_t *retval)
 {
+       int ciferror;
+       kauth_filesec_t xsecdst;
        struct vnode_attr va;
-       struct vfs_context context;
-       struct vnode *vp;
-       int error;
-       kauth_action_t action;
 
        AUDIT_ARG(owner, uap->uid, uap->gid);
-       AUDIT_ARG(fd, uap->fd);
-
-       if ( (error = file_vnode(uap->fd, &vp)) )
-               return (error);
 
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
+       xsecdst = KAUTH_FILESEC_NONE;
+       if (uap->xsecurity != USER_ADDR_NULL) {
+               if ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
+                       return ciferror;
        }
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
 
        VATTR_INIT(&va);
-       if (uap->uid != VNOVAL)
+       VATTR_SET(&va, va_mode, (uap->mode & ALLPERMS) & ~p->p_fd->fd_cmask);
+       if (uap->uid != KAUTH_UID_NONE)
                VATTR_SET(&va, va_uid, uap->uid);
-       if (uap->gid != VNOVAL)
+       if (uap->gid != KAUTH_GID_NONE)
                VATTR_SET(&va, va_gid, uap->gid);
+       if (xsecdst != KAUTH_FILESEC_NONE)
+               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       ciferror = mkfifo1(vfs_context_current(), uap->path, &va);
 
-       /* preflight and authorize attribute changes */
-       if ((error = vnode_authattr(vp, &va, &action, &context)) != 0)
-               goto out;
-       if (action && ((error = vnode_authorize(vp, NULL, action, &context)) != 0)) {
-               if (error == EACCES)
-                       error = EPERM;
-               goto out;
-       }
-       error = vnode_setattr(vp, &va, &context);
+       if (xsecdst != KAUTH_FILESEC_NONE)
+               kauth_filesec_free(xsecdst);
+       return ciferror;
+}
 
-out:
-       (void)vnode_put(vp);
-       file_drop(uap->fd);
-       return (error);
+/* ARGSUSED */
+int
+mkfifo(proc_t p, struct mkfifo_args *uap, __unused int32_t *retval)
+{
+       struct vnode_attr va;
+
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_mode, (uap->mode & ALLPERMS) & ~p->p_fd->fd_cmask);
+
+       return(mkfifo1(vfs_context_current(), uap->path, &va));
 }
 
-static int
-getutimes(usrtvp, tsp)
-       user_addr_t usrtvp;
-       struct timespec *tsp;
+
+static char *
+my_strrchr(char *p, int ch)
 {
-       struct user_timeval tv[2];
-       int error;
+       char *save;
 
-       if (usrtvp == USER_ADDR_NULL) {
-               struct timeval old_tv;
-               /* XXX Y2038 bug because of microtime argument */
-               microtime(&old_tv);
-               TIMEVAL_TO_TIMESPEC(&old_tv, &tsp[0]);
-               tsp[1] = tsp[0];
-       } else {
-               if (IS_64BIT_PROCESS(current_proc())) {
-                       error = copyin(usrtvp, (void *)tv, sizeof(tv));
-               } else {
-                       struct timeval old_tv[2];
-                       error = copyin(usrtvp, (void *)old_tv, sizeof(old_tv));
-                       tv[0].tv_sec = old_tv[0].tv_sec;
-                       tv[0].tv_usec = old_tv[0].tv_usec;
-                       tv[1].tv_sec = old_tv[1].tv_sec;
-                       tv[1].tv_usec = old_tv[1].tv_usec;
-               }
-               if (error)
-                       return (error);
-               TIMEVAL_TO_TIMESPEC(&tv[0], &tsp[0]);
-               TIMEVAL_TO_TIMESPEC(&tv[1], &tsp[1]);
+       for (save = NULL;; ++p) {
+               if (*p == ch)
+                       save = p;
+               if (!*p)
+                       return(save);
        }
-       return 0;
+       /* NOTREACHED */
 }
 
-static int
-setutimes(vfs_context_t ctx, struct vnode *vp, const struct timespec *ts,
-       int nullflag)
-{
-       int error;
-       struct vnode_attr va;
-       kauth_action_t action;
+extern int safe_getpath(struct vnode *dvp, char *leafname, char *path, int _len, int *truncated_path);
 
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+int
+safe_getpath(struct vnode *dvp, char *leafname, char *path, int _len, int *truncated_path)
+{
+       int ret, len = _len;
+
+       *truncated_path = 0;
+       ret = vn_getpath(dvp, path, &len);
+       if (ret == 0 && len < (MAXPATHLEN - 1)) {
+               if (leafname) {
+                       path[len-1] = '/';
+                       len += strlcpy(&path[len], leafname, MAXPATHLEN-len) + 1;
+                       if (len > MAXPATHLEN) {
+                               char *ptr;
+
+                               // the string got truncated!
+                               *truncated_path = 1;
+                               ptr = my_strrchr(path, '/');
+                               if (ptr) {
+                                       *ptr = '\0';   // chop off the string at the last directory component
+                               }
+                               len = strlen(path) + 1;
+                       }
+               }
+       } else if (ret == 0) {
+               *truncated_path = 1;
+       } else if (ret != 0) {
+               struct vnode *mydvp=dvp;
+
+               if (ret != ENOSPC) {
+                       printf("safe_getpath: failed to get the path for vp %p (%s) : err %d\n",
+                              dvp, dvp->v_name ? dvp->v_name : "no-name", ret);
+               }
+               *truncated_path = 1;
+
+               do {
+                       if (mydvp->v_parent != NULL) {
+                               mydvp = mydvp->v_parent;
+                       } else if (mydvp->v_mount) {
+                               strlcpy(path, mydvp->v_mount->mnt_vfsstat.f_mntonname, _len);
+                               break;
+                       } else {
+                               // no parent and no mount point?  only thing is to punt and say "/" changed
+                               strlcpy(path, "/", _len);
+                               len = 2;
+                               mydvp = NULL;
+                       }
 
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_access_time, ts[0]);
-       VATTR_SET(&va, va_modify_time, ts[1]);
-       if (nullflag)
-               va.va_vaflags |= VA_UTIMES_NULL;
+                       if (mydvp == NULL) {
+                               break;
+                       }
 
-       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0)
-               goto out;
-       /* since we may not need to auth anything, check here */
-       if ((action != 0) && ((error = vnode_authorize(vp, NULL, action, ctx)) != 0))
-               goto out;
-       error = vnode_setattr(vp, &va, ctx);
+                       len = _len;
+                       ret = vn_getpath(mydvp, path, &len);
+               } while (ret == ENOSPC);
+       }
 
-out:
-       return error;
+       return len;
 }
 
+
 /*
- * Set the access and modification times of a file.
+ * Make a hard file link.
+ *
+ * Returns:    0                       Success
+ *             EPERM
+ *             EEXIST
+ *             EXDEV
+ *     namei:???
+ *     vnode_authorize:???
+ *     VNOP_LINK:???
  */
 /* ARGSUSED */
-int
-utimes(struct proc *p, register struct utimes_args *uap, __unused register_t *retval)
+static int
+linkat_internal(vfs_context_t ctx, int fd1, user_addr_t path, int fd2,
+    user_addr_t link, int flag, enum uio_seg segflg)
 {
-       struct timespec ts[2];
-       user_addr_t usrtvp;
-       int error;
+       vnode_t vp, dvp, lvp;
        struct nameidata nd;
-       struct vfs_context context;
+       int follow;
+       int error;
+#if CONFIG_FSE
+       fse_info finfo;
+#endif
+       int need_event, has_listeners;
+       char *target_path = NULL;
+       int truncated=0;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       vp = dvp = lvp = NULLVP;
 
-       /* AUDIT: Needed to change the order of operations to do the 
-        * name lookup first because auditing wants the path.
-        */
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
+       /* look up the object we are linking to */
+       follow = (flag & AT_SYMLINK_FOLLOW) ? FOLLOW : NOFOLLOW;
+       NDINIT(&nd, LOOKUP, OP_LOOKUP, AUDITVNPATH1 | follow,
+           segflg, path, ctx);
+
+       error = nameiat(&nd, fd1);
        if (error)
                return (error);
+       vp = nd.ni_vp;
+
        nameidone(&nd);
 
        /*
-        * Fetch the user-supplied time.  If usrtvp is USER_ADDR_NULL, we fetch
-        * the current time instead.
+        * Normally, linking to directories is not supported.
+        * However, some file systems may have limited support.
         */
-       usrtvp = uap->tptr;
-       if ((error = getutimes(usrtvp, ts)) != 0)
-               goto out;
+       if (vp->v_type == VDIR) {
+               if (!ISSET(vp->v_mount->mnt_kern_flag, MNTK_DIR_HARDLINKS)) {
+                       error = EPERM;   /* POSIX */
+                       goto out;
+               }
 
-       error = setutimes(&context, nd.ni_vp, ts, usrtvp == USER_ADDR_NULL);
+               /* Linking to a directory requires ownership. */
+               if (!kauth_cred_issuser(vfs_context_ucred(ctx))) {
+                       struct vnode_attr dva;
 
-out:
-       vnode_put(nd.ni_vp);
-       return (error);
-}
+                       VATTR_INIT(&dva);
+                       VATTR_WANTED(&dva, va_uid);
+                       if (vnode_getattr(vp, &dva, ctx) != 0 ||
+                           !VATTR_IS_SUPPORTED(&dva, va_uid) ||
+                           (dva.va_uid != kauth_cred_getuid(vfs_context_ucred(ctx)))) {
+                               error = EACCES;
+                               goto out;
+                       }
+               }
+       }
 
-/*
- * Set the access and modification times of a file.
- */
-/* ARGSUSED */
-int
-futimes(struct proc *p, register struct futimes_args *uap, __unused register_t *retval)
-{
-       struct timespec ts[2];
-       struct vnode *vp;
-       user_addr_t usrtvp;
-       int error;
-       struct vfs_context context;
+       /* lookup the target node */
+#if CONFIG_TRIGGERS
+       nd.ni_op = OP_LINK;
+#endif
+       nd.ni_cnd.cn_nameiop = CREATE;
+       nd.ni_cnd.cn_flags = LOCKPARENT | AUDITVNPATH2 | CN_NBMOUNTLOOK;
+       nd.ni_dirp = link;
+       error = nameiat(&nd, fd2);
+       if (error != 0)
+               goto out;
+       dvp = nd.ni_dvp;
+       lvp = nd.ni_vp;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+#if CONFIG_MACF
+       if ((error = mac_vnode_check_link(ctx, dvp, vp, &nd.ni_cnd)) != 0)
+               goto out2;
+#endif
 
-       AUDIT_ARG(fd, uap->fd);
-       usrtvp = uap->tptr;
-       if ((error = getutimes(usrtvp, ts)) != 0)
-               return (error);
-       if ((error = file_vnode(uap->fd, &vp)) != 0)
-               return (error);
-       if((error = vnode_getwithref(vp))) {
-               file_drop(uap->fd);
-               return(error);
+       /* or to anything that kauth doesn't want us to (eg. immutable items) */
+       if ((error = vnode_authorize(vp, NULL, KAUTH_VNODE_LINKTARGET, ctx)) != 0)
+               goto out2;
+
+       /* target node must not exist */
+       if (lvp != NULLVP) {
+               error = EEXIST;
+               goto out2;
        }
+       /* cannot link across mountpoints */
+       if (vnode_mount(vp) != vnode_mount(dvp)) {
+               error = EXDEV;
+               goto out2;
+       }
 
-       error =  setutimes(&context, vp, ts, usrtvp == 0);
-       vnode_put(vp);
-       file_drop(uap->fd);
-       return(error);
-}
+       /* authorize creation of the target note */
+       if ((error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, ctx)) != 0)
+               goto out2;
 
-/*
- * Truncate a file given its path name.
- */
-/* ARGSUSED */
-int
-truncate(struct proc *p, register struct truncate_args *uap, __unused register_t *retval)
-{
-       register struct vnode *vp;
-       struct vnode_attr va;
-       struct vfs_context context;
-       int error;
-       struct nameidata nd;
-       kauth_action_t action;
+       /* and finally make the link */
+       error = VNOP_LINK(vp, dvp, &nd.ni_cnd, ctx);
+       if (error)
+               goto out2;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+#if CONFIG_MACF
+       (void)mac_vnode_notify_link(ctx, vp, dvp, &nd.ni_cnd);
+#endif
 
-       if (uap->length < 0)
-               return(EINVAL);
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       if ((error = namei(&nd)))
-               return (error);
-       vp = nd.ni_vp;
+#if CONFIG_FSE
+       need_event = need_fsevent(FSE_CREATE_FILE, dvp);
+#else
+       need_event = 0;
+#endif
+       has_listeners = kauth_authorize_fileop_has_listeners();
 
-       nameidone(&nd);
+       if (need_event || has_listeners) {
+               char *link_to_path = NULL;
+               int len, link_name_len;
 
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_data_size, uap->length);
-       if ((error = vnode_authattr(vp, &va, &action, &context)) != 0)
-               goto out;
-       if ((action != 0) && ((error = vnode_authorize(vp, NULL, action, &context)) != 0))
-               goto out;
-       error = vnode_setattr(vp, &va, &context);
+               /* build the path to the new link file */
+               GET_PATH(target_path);
+               if (target_path == NULL) {
+                       error = ENOMEM;
+                       goto out2;
+               }
+
+               len = safe_getpath(dvp, nd.ni_cnd.cn_nameptr, target_path, MAXPATHLEN, &truncated);
+
+               if (has_listeners) {
+                       /* build the path to file we are linking to */
+                       GET_PATH(link_to_path);
+                       if (link_to_path == NULL) {
+                               error = ENOMEM;
+                               goto out2;
+                       }
+
+                       link_name_len = MAXPATHLEN;
+                       if (vn_getpath(vp, link_to_path, &link_name_len) == 0) {
+                               /*
+                                * Call out to allow 3rd party notification of rename.
+                                * Ignore result of kauth_authorize_fileop call.
+                                */
+                               kauth_authorize_fileop(vfs_context_ucred(ctx), KAUTH_FILEOP_LINK,
+                                                      (uintptr_t)link_to_path,
+                                                      (uintptr_t)target_path);
+                       }
+                       if (link_to_path != NULL) {
+                               RELEASE_PATH(link_to_path);
+                       }
+               }
+#if CONFIG_FSE
+               if (need_event) {
+                       /* construct fsevent */
+                       if (get_fse_info(vp, &finfo, ctx) == 0) {
+                               if (truncated) {
+                                       finfo.mode |= FSE_TRUNCATED_PATH;
+                               }
+
+                               // build the path to the destination of the link
+                               add_fsevent(FSE_CREATE_FILE, ctx,
+                                           FSE_ARG_STRING, len, target_path,
+                                           FSE_ARG_FINFO, &finfo,
+                                           FSE_ARG_DONE);
+                       }
+                       if (vp->v_parent) {
+                           add_fsevent(FSE_STAT_CHANGED, ctx,
+                               FSE_ARG_VNODE, vp->v_parent,
+                               FSE_ARG_DONE);
+                       }
+               }
+#endif
+       }
+out2:
+       /*
+        * nameidone has to happen before we vnode_put(dvp)
+        * since it may need to release the fs_nodelock on the dvp
+        */
+       nameidone(&nd);
+       if (target_path != NULL) {
+               RELEASE_PATH(target_path);
+       }
 out:
+       if (lvp)
+               vnode_put(lvp);
+       if (dvp)
+               vnode_put(dvp);
        vnode_put(vp);
        return (error);
 }
 
+int
+link(__unused proc_t p, struct link_args *uap, __unused int32_t *retval)
+{
+       return (linkat_internal(vfs_context_current(), AT_FDCWD, uap->path,
+           AT_FDCWD, uap->link, AT_SYMLINK_FOLLOW, UIO_USERSPACE));
+}
+
+int
+linkat(__unused proc_t p, struct linkat_args *uap, __unused int32_t *retval)
+{
+       if (uap->flag & ~AT_SYMLINK_FOLLOW)
+               return (EINVAL);
+
+       return (linkat_internal(vfs_context_current(), uap->fd1, uap->path,
+           uap->fd2, uap->link, uap->flag, UIO_USERSPACE));
+}
+
 /*
- * Truncate a file given a file descriptor.
+ * Make a symbolic link.
+ *
+ * We could add support for ACLs here too...
  */
 /* ARGSUSED */
-int
-ftruncate(p, uap, retval)
-       struct proc *p;
-       register struct ftruncate_args *uap;
-       register_t *retval;
+static int
+symlinkat_internal(vfs_context_t ctx, user_addr_t path_data, int fd,
+    user_addr_t link, enum uio_seg segflg)
 {
-       struct vfs_context context;
        struct vnode_attr va;
-       struct vnode *vp;
-       struct fileproc *fp;
-       int error ;
-       int fd = uap->fd;
-
-       context.vc_proc = current_proc();
-       context.vc_ucred = kauth_cred_get();
-       
-       AUDIT_ARG(fd, uap->fd);
-       if (uap->length < 0)
-               return(EINVAL);
-        
-       if ( (error = fp_lookup(p,fd,&fp,0)) ) {
-               return(error);
-       }
+       char *path;
+       int error;
+       struct nameidata nd;
+       vnode_t vp, dvp;
+       size_t dummy=0;
+       proc_t p;
 
-       if (fp->f_fglob->fg_type == DTYPE_PSXSHM) {
-               error = pshm_truncate(p, fp, uap->fd, uap->length, retval);
-               goto out;
+       error = 0;
+       if (UIO_SEG_IS_USER_SPACE(segflg)) {
+               MALLOC_ZONE(path, char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
+               error = copyinstr(path_data, path, MAXPATHLEN, &dummy);
+       } else {
+               path = (char *)path_data;
        }
-       if (fp->f_fglob->fg_type != DTYPE_VNODE)  {
-               error = EINVAL;
+       if (error)
                goto out;
-       }
+       AUDIT_ARG(text, path);  /* This is the link string */
 
-       vp = (struct vnode *)fp->f_fglob->fg_data;
+       NDINIT(&nd, CREATE, OP_SYMLINK, LOCKPARENT | AUDITVNPATH1,
+            segflg, link, ctx);
 
-       if ((fp->f_fglob->fg_flag & FWRITE) == 0) {
-               AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
-               error = EINVAL;
+       error = nameiat(&nd, fd);
+       if (error)
                goto out;
+       dvp = nd.ni_dvp;
+       vp = nd.ni_vp;
+
+       p = vfs_context_proc(ctx);
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_type, VLNK);
+       VATTR_SET(&va, va_mode, ACCESSPERMS & ~p->p_fd->fd_cmask);
+
+#if CONFIG_MACF
+       error = mac_vnode_check_create(ctx,
+                       dvp, &nd.ni_cnd, &va);
+#endif
+       if (error != 0) {
+           goto skipit;
        }
 
-       if ((error = vnode_getwithref(vp)) != 0) {
-               goto out;
+       if (vp != NULL) {
+           error = EEXIST;
+           goto skipit;
+       }
+
+       /* authorize */
+       if (error == 0)
+               error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_FILE, ctx);
+       /* get default ownership, etc. */
+       if (error == 0)
+               error = vnode_authattr_new(dvp, &va, 0, ctx);
+       if (error == 0)
+               error = VNOP_SYMLINK(dvp, &vp, &nd.ni_cnd, &va, path, ctx);
+
+#if CONFIG_MACF
+       if (error == 0 && vp)
+               error = vnode_label(vnode_mount(vp), dvp, vp, &nd.ni_cnd, VNODE_LABEL_CREATE, ctx);
+#endif
+
+       /* do fallback attribute handling */
+       if (error == 0 && vp)
+               error = vnode_setattr_fallback(vp, &va, ctx);
+
+       if (error == 0) {
+               int     update_flags = 0;
+
+               /*check if a new vnode was created, else try to get one*/
+               if (vp == NULL) {
+                       nd.ni_cnd.cn_nameiop = LOOKUP;
+#if CONFIG_TRIGGERS
+                       nd.ni_op = OP_LOOKUP;
+#endif
+                       nd.ni_cnd.cn_flags = 0;
+                       error = nameiat(&nd, fd);
+                       vp = nd.ni_vp;
+
+                       if (vp == NULL)
+                               goto skipit;
+               }
+
+#if 0  /* XXX - kauth_todo - is KAUTH_FILEOP_SYMLINK needed? */
+               /* call out to allow 3rd party notification of rename.
+                * Ignore result of kauth_authorize_fileop call.
+                */
+               if (kauth_authorize_fileop_has_listeners() &&
+                   namei(&nd) == 0) {
+                       char *new_link_path = NULL;
+                       int             len;
+
+                       /* build the path to the new link file */
+                       new_link_path = get_pathbuff();
+                       len = MAXPATHLEN;
+                       vn_getpath(dvp, new_link_path, &len);
+                       if ((len + 1 + nd.ni_cnd.cn_namelen + 1) < MAXPATHLEN) {
+                               new_link_path[len - 1] = '/';
+                               strlcpy(&new_link_path[len], nd.ni_cnd.cn_nameptr, MAXPATHLEN-len);
+                       }
+
+                       kauth_authorize_fileop(vfs_context_ucred(ctx), KAUTH_FILEOP_SYMLINK,
+                                          (uintptr_t)path, (uintptr_t)new_link_path);
+                       if (new_link_path != NULL)
+                               release_pathbuff(new_link_path);
+               }
+#endif
+               // Make sure the name & parent pointers are hooked up
+               if (vp->v_name == NULL)
+                       update_flags |= VNODE_UPDATE_NAME;
+               if (vp->v_parent == NULLVP)
+                       update_flags |= VNODE_UPDATE_PARENT;
+
+               if (update_flags)
+                       vnode_update_identity(vp, dvp, nd.ni_cnd.cn_nameptr, nd.ni_cnd.cn_namelen, nd.ni_cnd.cn_hash, update_flags);
+
+#if CONFIG_FSE
+               add_fsevent(FSE_CREATE_FILE, ctx,
+                           FSE_ARG_VNODE, vp,
+                           FSE_ARG_DONE);
+#endif
        }
 
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+skipit:
+       /*
+        * nameidone has to happen before we vnode_put(dvp)
+        * since it may need to release the fs_nodelock on the dvp
+        */
+       nameidone(&nd);
 
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_data_size, uap->length);
-       error = vnode_setattr(vp, &va, &context);
-       (void)vnode_put(vp);
+       if (vp)
+               vnode_put(vp);
+       vnode_put(dvp);
 out:
-       file_drop(fd);
+       if (path && (path != (char *)path_data))
+               FREE_ZONE(path, MAXPATHLEN, M_NAMEI);
+
        return (error);
 }
 
+int
+symlink(__unused proc_t p, struct symlink_args *uap, __unused int32_t *retval)
+{
+       return (symlinkat_internal(vfs_context_current(), uap->path, AT_FDCWD,
+           uap->link, UIO_USERSPACE));
+}
+
+int
+symlinkat(__unused proc_t p, struct symlinkat_args *uap,
+    __unused int32_t *retval)
+{
+       return (symlinkat_internal(vfs_context_current(), uap->path1, uap->fd,
+           uap->path2, UIO_USERSPACE));
+}
 
 /*
- * Sync an open file.
+ * Delete a whiteout from the filesystem.
+ * No longer supported.
  */
-/* ARGSUSED */
 int
-fsync(struct proc *p, struct fsync_args *uap, __unused register_t *retval)
+undelete(__unused proc_t p, __unused struct undelete_args *uap, __unused int32_t *retval)
 {
-       struct vnode *vp;
-       struct fileproc *fp;
-       struct vfs_context context;
-       int error;
-
-       if ( (error = fp_getfvp(p, uap->fd, &fp, &vp)) )
-               return (error);
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
-       }
-       context.vc_proc = p;
-       context.vc_ucred = fp->f_fglob->fg_cred;
-
-       error = VNOP_FSYNC(vp, MNT_WAIT, &context);
-
-       (void)vnode_put(vp);
-       file_drop(uap->fd);
-       return (error);
+       return (ENOTSUP);
 }
 
 /*
- * Duplicate files.  Source must be a file, target must be a file or 
- * must not exist.
- *
- * XXX Copyfile authorisation checking is woefully inadequate, and will not
- *     perform inheritance correctly.
+ * Delete a name from the filesystem.
  */
 /* ARGSUSED */
-int
-copyfile(struct proc *p, register struct copyfile_args *uap, __unused register_t *retval)
+static int
+unlinkat_internal(vfs_context_t ctx, int fd, vnode_t start_dvp,
+    user_addr_t path_arg, enum uio_seg segflg, int unlink_flags)
 {
-       vnode_t tvp, fvp, tdvp, sdvp;
-       struct nameidata fromnd, tond;
+       struct nameidata nd;
+       vnode_t vp, dvp;
        int error;
-       struct vfs_context context;
+       struct componentname *cnp;
+       char  *path = NULL;
+       int  len=0;
+#if CONFIG_FSE
+       fse_info  finfo;
+       struct vnode_attr va;
+#endif
+       int flags;
+       int need_event;
+       int has_listeners;
+       int truncated_path;
+       int batched;
+       struct vnode_attr *vap;
+       int do_retry;
+       int retry_count = 0;
+       int cn_flags;
+
+       cn_flags = LOCKPARENT;
+       if (!(unlink_flags & VNODE_REMOVE_NO_AUDIT_PATH))
+               cn_flags |= AUDITVNPATH1;
+       /* If a starting dvp is passed, it trumps any fd passed. */
+       if (start_dvp)
+               cn_flags |= USEDVP;
+
+#if NAMEDRSRCFORK
+       /* unlink or delete is allowed on rsrc forks and named streams */
+       cn_flags |= CN_ALLOWRSRCFORK;
+#endif
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+retry:
+       do_retry = 0;
+       flags = 0;
+       need_event = 0;
+       has_listeners = 0;
+       truncated_path = 0;
+       vap = NULL;
 
-       /* Check that the flags are valid. */
+       NDINIT(&nd, DELETE, OP_UNLINK, cn_flags, segflg, path_arg, ctx);
 
-       if (uap->flags & ~CPF_MASK) {
-               return(EINVAL);
-       }
+       nd.ni_dvp = start_dvp;
+       nd.ni_flag |= NAMEI_COMPOUNDREMOVE;
+       cnp = &nd.ni_cnd;
 
-       NDINIT(&fromnd, LOOKUP, SAVESTART | AUDITVNPATH1,
-               UIO_USERSPACE, uap->from, &context);
-       if ((error = namei(&fromnd)))
+continue_lookup:
+       error = nameiat(&nd, fd);
+       if (error)
                return (error);
-       fvp = fromnd.ni_vp;
 
-       NDINIT(&tond, CREATE,  LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | AUDITVNPATH2,
-           UIO_USERSPACE, uap->to, &context);
-       if ((error = namei(&tond))) {
-               goto out1;
+       dvp = nd.ni_dvp;
+       vp = nd.ni_vp;
+
+
+       /* With Carbon delete semantics, busy files cannot be deleted */
+       if (unlink_flags & VNODE_REMOVE_NODELETEBUSY) {
+               flags |= VNODE_REMOVE_NODELETEBUSY;
        }
-       tdvp = tond.ni_dvp;
-       tvp = tond.ni_vp;
 
-       if (tvp != NULL) {
-               if (!(uap->flags & CPF_OVERWRITE)) {
-                       error = EEXIST;
+       /* Skip any potential upcalls if told to. */
+       if (unlink_flags & VNODE_REMOVE_SKIP_NAMESPACE_EVENT) {
+               flags |= VNODE_REMOVE_SKIP_NAMESPACE_EVENT;
+       }
+
+       if (vp) {
+               batched = vnode_compound_remove_available(vp);
+               /*
+                * The root of a mounted filesystem cannot be deleted.
+                */
+               if (vp->v_flag & VROOT) {
+                       error = EBUSY;
+               }
+
+#if DEVELOPMENT || DEBUG
+       /*
+        * XXX VSWAP: Check for entitlements or special flag here
+        * so we can restrict access appropriately.
+        */
+#else /* DEVELOPMENT || DEBUG */
+
+               if (vnode_isswap(vp) && (ctx != vfs_context_kernel())) {
+                       error = EPERM;
                        goto out;
                }
+#endif /* DEVELOPMENT || DEBUG */
+
+               if (!batched) {
+                       error = vn_authorize_unlink(dvp, vp, cnp, ctx, NULL);
+                       if (error) {
+                               if (error == ENOENT) {
+                                       assert(retry_count < MAX_AUTHORIZE_ENOENT_RETRIES);
+                                       if (retry_count < MAX_AUTHORIZE_ENOENT_RETRIES) {
+                                               do_retry = 1;
+                                               retry_count++;
+                                       }
+                               }
+                               goto out;
+                       }
+               }
+       } else {
+               batched = 1;
+
+               if (!vnode_compound_remove_available(dvp)) {
+                       panic("No vp, but no compound remove?");
+               }
        }
-       if (fvp->v_type == VDIR || (tvp && tvp->v_type == VDIR)) {
-               error = EISDIR;
-               goto out;
+
+#if CONFIG_FSE
+       need_event = need_fsevent(FSE_DELETE, dvp);
+       if (need_event) {
+               if (!batched) {
+                       if ((vp->v_flag & VISHARDLINK) == 0) {
+                               /* XXX need to get these data in batched VNOP */
+                               get_fse_info(vp, &finfo, ctx);
+                       }
+               } else {
+                       error = vfs_get_notify_attributes(&va);
+                       if (error) {
+                               goto out;
+                       }
+
+                       vap = &va;
+               }
+       }
+#endif
+       has_listeners = kauth_authorize_fileop_has_listeners();
+       if (need_event || has_listeners) {
+               if (path == NULL) {
+                       GET_PATH(path);
+                       if (path == NULL) {
+                               error = ENOMEM;
+                               goto out;
+                       }
+               }
+               len = safe_getpath(dvp, nd.ni_cnd.cn_nameptr, path, MAXPATHLEN, &truncated_path);
        }
 
-       if ((error = vnode_authorize(tdvp, NULL, KAUTH_VNODE_ADD_FILE, &context)) != 0)
-               goto out;
+#if NAMEDRSRCFORK
+       if (nd.ni_cnd.cn_flags & CN_WANTSRSRCFORK)
+               error = vnode_removenamedstream(dvp, vp, XATTR_RESOURCEFORK_NAME, 0, ctx);
+       else
+#endif
+       {
+               error = vn_remove(dvp, &nd.ni_vp, &nd, flags, vap, ctx);
+               vp = nd.ni_vp;
+               if (error == EKEEPLOOKING) {
+                       if (!batched) {
+                               panic("EKEEPLOOKING, but not a filesystem that supports compound VNOPs?");
+                       }
+
+                       if ((nd.ni_flag & NAMEI_CONTLOOKUP) == 0) {
+                               panic("EKEEPLOOKING, but continue flag not set?");
+                       }
+
+                       if (vnode_isdir(vp)) {
+                               error = EISDIR;
+                               goto out;
+                       }
+                       goto continue_lookup;
+               } else if (error == ENOENT && batched) {
+                       assert(retry_count < MAX_AUTHORIZE_ENOENT_RETRIES);
+                       if (retry_count < MAX_AUTHORIZE_ENOENT_RETRIES) {
+                               /*
+                                * For compound VNOPs, the authorization callback may
+                                * return ENOENT in case of racing hardlink lookups
+                                * hitting the name  cache, redrive the lookup.
+                                */
+                               do_retry = 1;
+                               retry_count += 1;
+                               goto out;
+                       }
+               }
+       }
 
-       if (fvp == tdvp)
-               error = EINVAL;
        /*
-        * If source is the same as the destination (that is the
-        * same inode number) then there is nothing to do.
-        * (fixed to have POSIX semantics - CSM 3/2/98)
+        * Call out to allow 3rd party notification of delete.
+        * Ignore result of kauth_authorize_fileop call.
         */
-       if (fvp == tvp)
-               error = -1;
-       if (!error)
-               error = VNOP_COPYFILE(fvp,tdvp,tvp,&tond.ni_cnd,uap->mode,uap->flags,&context);
+       if (!error) {
+               if (has_listeners) {
+                       kauth_authorize_fileop(vfs_context_ucred(ctx),
+                               KAUTH_FILEOP_DELETE,
+                               (uintptr_t)vp,
+                               (uintptr_t)path);
+               }
+
+               if (vp->v_flag & VISHARDLINK) {
+                   //
+                   // if a hardlink gets deleted we want to blow away the
+                   // v_parent link because the path that got us to this
+                   // instance of the link is no longer valid.  this will
+                   // force the next call to get the path to ask the file
+                   // system instead of just following the v_parent link.
+                   //
+                   vnode_update_identity(vp, NULL, NULL, 0, 0, VNODE_UPDATE_PARENT);
+               }
+
+#if CONFIG_FSE
+               if (need_event) {
+                       if (vp->v_flag & VISHARDLINK) {
+                               get_fse_info(vp, &finfo, ctx);
+                       } else if (vap) {
+                               vnode_get_fse_info_from_vap(vp, &finfo, vap);
+                       }
+                       if (truncated_path) {
+                               finfo.mode |= FSE_TRUNCATED_PATH;
+                       }
+                       add_fsevent(FSE_DELETE, ctx,
+                                               FSE_ARG_STRING, len, path,
+                                               FSE_ARG_FINFO, &finfo,
+                                               FSE_ARG_DONE);
+               }
+#endif
+       }
+
 out:
-       sdvp = tond.ni_startdir;
+       if (path != NULL)
+               RELEASE_PATH(path);
+
+#if NAMEDRSRCFORK
+       /* recycle the deleted rsrc fork vnode to force a reclaim, which
+        * will cause its shadow file to go away if necessary.
+        */
+        if (vp && (vnode_isnamedstream(vp)) &&
+               (vp->v_parent != NULLVP) &&
+               vnode_isshadow(vp)) {
+                       vnode_recycle(vp);
+        }
+#endif
        /*
-        * nameidone has to happen before we vnode_put(tdvp)
-        * since it may need to release the fs_nodelock on the tdvp
+        * nameidone has to happen before we vnode_put(dvp)
+        * since it may need to release the fs_nodelock on the dvp
         */
-       nameidone(&tond);
-
-       if (tvp)
-               vnode_put(tvp);
-       vnode_put(tdvp);
-       vnode_put(sdvp);
-out1:
-       vnode_put(fvp);
+       nameidone(&nd);
+       vnode_put(dvp);
+       if (vp) {
+               vnode_put(vp);
+       }
 
-       if (fromnd.ni_startdir)
-               vnode_put(fromnd.ni_startdir);
-       nameidone(&fromnd);
+       if (do_retry) {
+               goto retry;
+       }
 
-       if (error == -1)
-               return (0);
        return (error);
 }
 
+int
+unlink1(vfs_context_t ctx, vnode_t start_dvp, user_addr_t path_arg,
+    enum uio_seg segflg, int unlink_flags)
+{
+       return (unlinkat_internal(ctx, AT_FDCWD, start_dvp, path_arg, segflg,
+           unlink_flags));
+}
 
 /*
- * Rename files.  Source and destination must either both be directories,
- * or both not be directories.  If target is a directory, it must be empty.
+ * Delete a name from the filesystem using Carbon semantics.
  */
-/* ARGSUSED */
 int
-rename(proc_t p, register struct rename_args *uap, __unused register_t *retval)
+delete(__unused proc_t p, struct delete_args *uap, __unused int32_t *retval)
 {
-       vnode_t tvp, tdvp;
-       vnode_t fvp, fdvp;
-       struct nameidata fromnd, tond;
-       struct vfs_context context;
-       int error;
-       int mntrename;
-       char *oname, *from_name, *to_name;
-       int from_len, to_len;
-       int holding_mntlock;
-       mount_t locked_mp = NULL;
-       vnode_t oparent;
-       fse_info from_finfo, to_finfo;
-       
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-       holding_mntlock = 0;
-retry:
-       fvp = tvp = NULL;
-       fdvp = tdvp = NULL;
-       mntrename = FALSE;
-
-       NDINIT(&fromnd, DELETE, WANTPARENT | AUDITVNPATH1, UIO_USERSPACE, uap->from, &context);
-       
-       if ( (error = namei(&fromnd)) )
-               goto out1;
-       fdvp = fromnd.ni_dvp;
-       fvp  = fromnd.ni_vp;
+       return (unlinkat_internal(vfs_context_current(), AT_FDCWD, NULLVP,
+           uap->path, UIO_USERSPACE, VNODE_REMOVE_NODELETEBUSY));
+}
 
-       NDINIT(&tond, RENAME, WANTPARENT | AUDITVNPATH2, UIO_USERSPACE, uap->to, &context);
-       if (fvp->v_type == VDIR)
-               tond.ni_cnd.cn_flags |= WILLBEDIR;
+/*
+ * Delete a name from the filesystem using POSIX semantics.
+ */
+int
+unlink(__unused proc_t p, struct unlink_args *uap, __unused int32_t *retval)
+{
+       return (unlinkat_internal(vfs_context_current(), AT_FDCWD, NULLVP,
+           uap->path, UIO_USERSPACE, 0));
+}
 
-       if ( (error = namei(&tond)) ) {
-               /*
-                * Translate error code for rename("dir1", "dir2/.").
-                */
-               if (error == EISDIR && fvp->v_type == VDIR) 
-                       error = EINVAL;
-               goto out1;
+int
+unlinkat(__unused proc_t p, struct unlinkat_args *uap, __unused int32_t *retval)
+{
+       if (uap->flag & ~AT_REMOVEDIR)
+               return (EINVAL);
+
+       if (uap->flag & AT_REMOVEDIR)
+               return (rmdirat_internal(vfs_context_current(), uap->fd,
+                   uap->path, UIO_USERSPACE));
+       else
+               return (unlinkat_internal(vfs_context_current(), uap->fd,
+                   NULLVP, uap->path, UIO_USERSPACE, 0));
+}
+
+/*
+ * Reposition read/write file offset.
+ */
+int
+lseek(proc_t p, struct lseek_args *uap, off_t *retval)
+{
+       struct fileproc *fp;
+       vnode_t vp;
+       struct vfs_context *ctx;
+       off_t offset = uap->offset, file_size;
+       int error;
+
+       if ( (error = fp_getfvp(p,uap->fd, &fp, &vp)) ) {
+               if (error == ENOTSUP)
+                       return (ESPIPE);
+               return (error);
+       }
+       if (vnode_isfifo(vp)) {
+               file_drop(uap->fd);
+               return(ESPIPE);
        }
-       tdvp = tond.ni_dvp;
-       tvp  = tond.ni_vp;
 
-       if (tvp != NULL) {
-               if (fvp->v_type == VDIR && tvp->v_type != VDIR) {
-                       error = ENOTDIR;
-                       goto out1;
-               } else if (fvp->v_type != VDIR && tvp->v_type == VDIR) {
-                       error = EISDIR;
-                       goto out1;
-               }
+
+       ctx = vfs_context_current();
+#if CONFIG_MACF
+       if (uap->whence == L_INCR && uap->offset == 0)
+               error = mac_file_check_get_offset(vfs_context_ucred(ctx),
+                   fp->f_fglob);
+       else
+               error = mac_file_check_change_offset(vfs_context_ucred(ctx),
+                   fp->f_fglob);
+       if (error) {
+               file_drop(uap->fd);
+               return (error);
+       }
+#endif
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
        }
-       if (fvp == tdvp) {
+
+       switch (uap->whence) {
+       case L_INCR:
+               offset += fp->f_fglob->fg_offset;
+               break;
+       case L_XTND:
+               if ((error = vnode_size(vp, &file_size, ctx)) != 0)
+                       break;
+               offset += file_size;
+               break;
+       case L_SET:
+               break;
+       case SEEK_HOLE:
+        error = VNOP_IOCTL(vp, FSIOC_FIOSEEKHOLE, (caddr_t)&offset, 0, ctx);
+               break;
+       case SEEK_DATA:
+        error = VNOP_IOCTL(vp, FSIOC_FIOSEEKDATA, (caddr_t)&offset, 0, ctx);
+               break;
+       default:
                error = EINVAL;
-               goto out1;
+       }
+       if (error == 0) {
+               if (uap->offset > 0 && offset < 0) {
+                       /* Incremented/relative move past max size */
+                       error = EOVERFLOW;
+               } else {
+                       /*
+                        * Allow negative offsets on character devices, per
+                        * POSIX 1003.1-2001.  Most likely for writing disk
+                        * labels.
+                        */
+                       if (offset < 0 && vp->v_type != VCHR) {
+                               /* Decremented/relative move before start */
+                               error = EINVAL;
+                       } else {
+                               /* Success */
+                               fp->f_fglob->fg_offset = offset;
+                               *retval = fp->f_fglob->fg_offset;
+                       }
+               }
        }
 
        /*
-        * Authorization.
-        *
-        * If tvp is a directory and not the same as fdvp, or tdvp is not the same as fdvp,
-        * the node is moving between directories and we need rights to remove from the
-        * old and add to the new.
-        *
-        * If tvp already exists and is not a directory, we need to be allowed to delete it.
-        *
-        * Note that we do not inherit when renaming.  XXX this needs to be revisited to
-        * implement the deferred-inherit bit.
+        * An lseek can affect whether data is "available to read."  Use
+        * hint of NOTE_NONE so no EVFILT_VNODE events fire
         */
-       {
-               int moving = 0;
+       post_event_if_success(vp, error, NOTE_NONE);
+       (void)vnode_put(vp);
+       file_drop(uap->fd);
+       return (error);
+}
 
-               error = 0;
-               if ((tvp != NULL) && vnode_isdir(tvp)) {
-                       if (tvp != fdvp)
-                               moving = 1;
-               } else if (tdvp != fdvp) {
-                       moving = 1;
+
+/*
+ * Check access permissions.
+ *
+ * Returns:    0                       Success
+ *             vnode_authorize:???
+ */
+static int
+access1(vnode_t vp, vnode_t dvp, int uflags, vfs_context_t ctx)
+{
+       kauth_action_t action;
+       int error;
+
+       /*
+        * If just the regular access bits, convert them to something
+        * that vnode_authorize will understand.
+        */
+       if (!(uflags & _ACCESS_EXTENDED_MASK)) {
+               action = 0;
+               if (uflags & R_OK)
+                       action |= KAUTH_VNODE_READ_DATA;        /* aka KAUTH_VNODE_LIST_DIRECTORY */
+               if (uflags & W_OK) {
+                       if (vnode_isdir(vp)) {
+                               action |= KAUTH_VNODE_ADD_FILE |
+                                   KAUTH_VNODE_ADD_SUBDIRECTORY;
+                               /* might want delete rights here too */
+                       } else {
+                               action |= KAUTH_VNODE_WRITE_DATA;
+                       }
                }
-               /*
-                * must have delete rights to remove the old name even in the simple case of
-                * fdvp == tdvp
-                */
-               if ((error = vnode_authorize(fvp, fdvp, KAUTH_VNODE_DELETE, &context)) != 0)
-                       goto auth_exit;
-               if (moving) {
-                       /* moving into tdvp or tvp, must have rights to add */
-                       if ((error = vnode_authorize(((tvp != NULL) && vnode_isdir(tvp)) ? tvp : tdvp,
-                                NULL, 
-                                vnode_isdir(fvp) ? KAUTH_VNODE_ADD_SUBDIRECTORY : KAUTH_VNODE_ADD_FILE,
-                                &context)) != 0)
-                               goto auth_exit;
-               } else {
-                       /* node staying in same directory, must be allowed to add new name */
-                       if ((error = vnode_authorize(fdvp, NULL,
-                                vnode_isdir(fvp) ? KAUTH_VNODE_ADD_SUBDIRECTORY : KAUTH_VNODE_ADD_FILE, &context)) != 0)
-                               goto auth_exit;
-               }
-               /* overwriting tvp */
-               if ((tvp != NULL) && !vnode_isdir(tvp) &&
-                   ((error = vnode_authorize(tvp, tdvp, KAUTH_VNODE_DELETE, &context)) != 0))
-                       goto auth_exit;
-                   
-               /* XXX more checks? */
-
-auth_exit:
-               /* authorization denied */
-               if (error != 0)
-                       goto out1;
-       }
-       /*
-        * Allow the renaming of mount points.
-        * - target must not exist
-        * - target must reside in the same directory as source
-        * - union mounts cannot be renamed
-        * - "/" cannot be renamed
-        */
-       if ((fvp->v_flag & VROOT) &&
-           (fvp->v_type == VDIR) &&
-           (tvp == NULL)  &&
-           (fvp->v_mountedhere == NULL)  &&
-           (fdvp == tdvp)  &&
-           ((fvp->v_mount->mnt_flag & (MNT_UNION | MNT_ROOTFS)) == 0)  &&
-           (fvp->v_mount->mnt_vnodecovered != NULLVP)) {
-               struct vnode *coveredvp;
-       
-               /* switch fvp to the covered vnode */
-               coveredvp = fvp->v_mount->mnt_vnodecovered;
-               if ( (vnode_getwithref(coveredvp)) ) {
-                       error = ENOENT;
-                       goto out1;
+               if (uflags & X_OK) {
+                       if (vnode_isdir(vp)) {
+                               action |= KAUTH_VNODE_SEARCH;
+                       } else {
+                               action |= KAUTH_VNODE_EXECUTE;
+                       }
                }
-               vnode_put(fvp);
+       } else {
+               /* take advantage of definition of uflags */
+               action = uflags >> 8;
+       }
 
-               fvp = coveredvp;
-               mntrename = TRUE;
+#if CONFIG_MACF
+       error = mac_vnode_check_access(ctx, vp, uflags);
+       if (error)
+               return (error);
+#endif /* MAC */
+
+       /* action == 0 means only check for existence */
+       if (action != 0) {
+               error = vnode_authorize(vp, dvp, action | KAUTH_VNODE_ACCESS, ctx);
+       } else {
+               error = 0;
        }
+
+       return(error);
+}
+
+
+
+/*
+ * access_extended: Check access permissions in bulk.
+ *
+ * Description:        uap->entries            Pointer to an array of accessx
+ *                                     descriptor structs, plus one or
+ *                                     more NULL terminated strings (see
+ *                                     "Notes" section below).
+ *             uap->size               Size of the area pointed to by
+ *                                     uap->entries.
+ *             uap->results            Pointer to the results array.
+ *
+ * Returns:    0                       Success
+ *             ENOMEM                  Insufficient memory
+ *             EINVAL                  Invalid arguments
+ *             namei:EFAULT            Bad address
+ *             namei:ENAMETOOLONG      Filename too long
+ *             namei:ENOENT            No such file or directory
+ *             namei:ELOOP             Too many levels of symbolic links
+ *             namei:EBADF             Bad file descriptor
+ *             namei:ENOTDIR           Not a directory
+ *             namei:???
+ *             access1:
+ *
+ * Implicit returns:
+ *             uap->results            Array contents modified
+ *
+ * Notes:      The uap->entries are structured as an arbitrary length array
+ *             of accessx descriptors, followed by one or more NULL terminated
+ *             strings
+ *
+ *                     struct accessx_descriptor[0]
+ *                     ...
+ *                     struct accessx_descriptor[n]
+ *                     char name_data[0];
+ *
+ *             We determine the entry count by walking the buffer containing
+ *             the uap->entries argument descriptor.  For each descriptor we
+ *             see, the valid values for the offset ad_name_offset will be
+ *             in the byte range:
+ *
+ *                     [ uap->entries + sizeof(struct accessx_descriptor) ]
+ *                                             to
+ *                             [ uap->entries + uap->size - 2 ]
+ *
+ *             since we must have at least one string, and the string must
+ *             be at least one character plus the NULL terminator in length.
+ *
+ * XXX:                Need to support the check-as uid argument
+ */
+int
+access_extended(__unused proc_t p, struct access_extended_args *uap, __unused int32_t *retval)
+{
+       struct accessx_descriptor *input = NULL;
+       errno_t *result = NULL;
+       errno_t error = 0;
+       int wantdelete = 0;
+       unsigned int desc_max, desc_actual, i, j;
+       struct vfs_context context;
+       struct nameidata nd;
+       int niopts;
+       vnode_t vp = NULL;
+       vnode_t dvp = NULL;
+#define ACCESSX_MAX_DESCR_ON_STACK 10
+       struct accessx_descriptor stack_input[ACCESSX_MAX_DESCR_ON_STACK];
+
+       context.vc_ucred = NULL;
+
        /*
-        * Check for cross-device rename.
+        * Validate parameters; if valid, copy the descriptor array and string
+        * arguments into local memory.  Before proceeding, the following
+        * conditions must have been met:
+        *
+        * o    The total size is not permitted to exceed ACCESSX_MAX_TABLESIZE
+        * o    There must be sufficient room in the request for at least one
+        *      descriptor and a one yte NUL terminated string.
+        * o    The allocation of local storage must not fail.
         */
-       if ((fvp->v_mount != tdvp->v_mount) ||
-           (tvp && (fvp->v_mount != tvp->v_mount))) {
-               error = EXDEV;
-               goto out1;
+       if (uap->size > ACCESSX_MAX_TABLESIZE)
+               return(ENOMEM);
+       if (uap->size < (sizeof(struct accessx_descriptor) + 2))
+               return(EINVAL);
+       if (uap->size <= sizeof (stack_input)) {
+               input = stack_input;
+       } else {
+       MALLOC(input, struct accessx_descriptor *, uap->size, M_TEMP, M_WAITOK);
+       if (input == NULL) {
+               error = ENOMEM;
+               goto out;
        }
-       /*
-        * Avoid renaming "." and "..".
-        */
-       if (fvp->v_type == VDIR &&
-           ((fdvp == fvp) ||
-            (fromnd.ni_cnd.cn_namelen == 1 && fromnd.ni_cnd.cn_nameptr[0] == '.') ||
-            ((fromnd.ni_cnd.cn_flags | tond.ni_cnd.cn_flags) & ISDOTDOT)) ) {
-               error = EINVAL;
-               goto out1;
        }
+       error = copyin(uap->entries, input, uap->size);
+       if (error)
+               goto out;
+
+       AUDIT_ARG(opaque, input, uap->size);
+
        /*
-        * The following edge case is caught here:
-        * (to cannot be a descendent of from)
-        *
-        *       o fdvp
-        *      /
-        *     /
-        *    o fvp
-        *     \
-        *      \
-        *       o tdvp
-        *      /
-        *     /
-        *    o tvp
+        * Force NUL termination of the copyin buffer to avoid nami() running
+        * off the end.  If the caller passes us bogus data, they may get a
+        * bogus result.
         */
-       if (tdvp->v_parent == fvp) {
-               error = EINVAL;
-               goto out1;
-       }
+       ((char *)input)[uap->size - 1] = 0;
 
        /*
-        * If source is the same as the destination (that is the
-        * same inode number) then there is nothing to do...
-        * EXCEPT if the underlying file system supports case
-        * insensitivity and is case preserving.  In this case
-        * the file system needs to handle the special case of
-        * getting the same vnode as target (fvp) and source (tvp).
-        *
-        * Only file systems that support pathconf selectors _PC_CASE_SENSITIVE
-        * and _PC_CASE_PRESERVING can have this exception, and they need to
-        * handle the special case of getting the same vnode as target and
-        * source.  NOTE: Then the target is unlocked going into vnop_rename,
-        * so not to cause locking problems. There is a single reference on tvp.
-        *
-        * NOTE - that fvp == tvp also occurs if they are hard linked - NOTE
-        * that correct behaviour then is just to remove the source (link)
+        * Access is defined as checking against the process' real identity,
+        * even if operations are checking the effective identity.  This
+        * requires that we use a local vfs context.
+        */
+       context.vc_ucred = kauth_cred_copy_real(kauth_cred_get());
+       context.vc_thread = current_thread();
+
+       /*
+        * Find out how many entries we have, so we can allocate the result
+        * array by walking the list and adjusting the count downward by the
+        * earliest string offset we see.
         */
-       if (fvp == tvp && fdvp == tdvp) {
-               if (fromnd.ni_cnd.cn_namelen == tond.ni_cnd.cn_namelen &&
-                   !bcmp(fromnd.ni_cnd.cn_nameptr, tond.ni_cnd.cn_nameptr,
-                         fromnd.ni_cnd.cn_namelen)) {
-                       goto out1;
+       desc_max = (uap->size - 2) / sizeof(struct accessx_descriptor);
+       desc_actual = desc_max;
+       for (i = 0; i < desc_actual; i++) {
+               /*
+                * Take the offset to the name string for this entry and
+                * convert to an input array index, which would be one off
+                * the end of the array if this entry was the lowest-addressed
+                * name string.
+                */
+               j = input[i].ad_name_offset / sizeof(struct accessx_descriptor);
+
+               /*
+                * An offset greater than the max allowable offset is an error.
+                * It is also an error for any valid entry to point
+                * to a location prior to the end of the current entry, if
+                * it's not a reference to the string of the previous entry.
+                */
+               if (j > desc_max || (j != 0 && j <= i)) {
+                       error = EINVAL;
+                       goto out;
                }
-       }
 
-       if (holding_mntlock && fvp->v_mount != locked_mp) {
-               /*
-                * we're holding a reference and lock
-                * on locked_mp, but it no longer matches
-                * what we want to do... so drop our hold
+               /* Also do not let ad_name_offset point to something beyond the size of the input */
+               if (input[i].ad_name_offset >= uap->size) {
+                       error = EINVAL;
+                       goto out;
+               }
+
+               /*
+                * An offset of 0 means use the previous descriptor's offset;
+                * this is used to chain multiple requests for the same file
+                * to avoid multiple lookups.
                 */
-               mount_unlock_renames(locked_mp);
-               mount_drop(locked_mp, 0);
-               holding_mntlock = 0;
-       }
-       if (tdvp != fdvp && fvp->v_type == VDIR) {
-               /*
-                * serialize renames that re-shape
-                * the tree... if holding_mntlock is
-                * set, then we're ready to go...
-                * otherwise we
-                * first need to drop the iocounts
-                * we picked up, second take the
-                * lock to serialize the access,
-                * then finally start the lookup
-                * process over with the lock held
-                */
-               if (!holding_mntlock) {
-                       /*
-                        * need to grab a reference on
-                        * the mount point before we
-                        * drop all the iocounts... once
-                        * the iocounts are gone, the mount
-                        * could follow
-                        */
-                       locked_mp = fvp->v_mount;
-                       mount_ref(locked_mp, 0);
-
-                       /*
-                        * nameidone has to happen before we vnode_put(tvp)
-                        * since it may need to release the fs_nodelock on the tvp
-                        */
-                       nameidone(&tond);
-
-                       if (tvp)
-                               vnode_put(tvp);
-                       vnode_put(tdvp);
-
-                       /*
-                        * nameidone has to happen before we vnode_put(fdvp)
-                        * since it may need to release the fs_nodelock on the fvp
-                        */
-                       nameidone(&fromnd);
-
-                       vnode_put(fvp);
-                       vnode_put(fdvp);
-
-                       mount_lock_renames(locked_mp);
-                       holding_mntlock = 1;
-
-                       goto retry;
-               }
-       } else {
-               /*
-                * when we dropped the iocounts to take
-                * the lock, we allowed the identity of 
-                * the various vnodes to change... if they did,
-                * we may no longer be dealing with a rename
-                * that reshapes the tree... once we're holding
-                * the iocounts, the vnodes can't change type
-                * so we're free to drop the lock at this point
-                * and continue on
-                */
-               if (holding_mntlock) {
-                       mount_unlock_renames(locked_mp);
-                       mount_drop(locked_mp, 0);
-                       holding_mntlock = 0;
-               }
-       }
-       // save these off so we can later verify that fvp is the same
-       oname   = fvp->v_name;
-       oparent = fvp->v_parent;
-
-       if (need_fsevent(FSE_RENAME, fvp)) {
-               get_fse_info(fvp, &from_finfo, &context);
-
-               if (tvp) {
-                       get_fse_info(tvp, &to_finfo, &context);
-               }
-               from_name = get_pathbuff();
-               from_len = MAXPATHLEN;
-               vn_getpath(fvp, from_name, &from_len);
-
-               to_name = get_pathbuff();
-               to_len = MAXPATHLEN;
-
-               if (tvp && tvp->v_type != VDIR) {
-                       vn_getpath(tvp, to_name, &to_len);
-               } else {
-                       vn_getpath(tdvp, to_name, &to_len);
-                       // if the path is not just "/", then append a "/"
-                       if (to_len > 2) {
-                               to_name[to_len-1] = '/';
-                       } else {
-                               to_len--;
+               if (j == 0) {
+                       /* This is not valid for the first entry */
+                       if (i == 0) {
+                               error = EINVAL;
+                               goto out;
                        }
-                       strcpy(&to_name[to_len], tond.ni_cnd.cn_nameptr);
-                       to_len += tond.ni_cnd.cn_namelen + 1;
-                       to_name[to_len] = '\0';
+                       continue;
                }
-       } else {
-               from_name = NULL;
-               to_name   = NULL;
-       }
-       error = VNOP_RENAME(fdvp, fvp, &fromnd.ni_cnd,
-                           tdvp, tvp, &tond.ni_cnd,
-                           &context);
 
-       if (holding_mntlock) {
                /*
-                * we can drop our serialization
-                * lock now
+                * If the offset of the string for this descriptor is before
+                * what we believe is the current actual last descriptor,
+                * then we need to adjust our estimate downward; this permits
+                * the string table following the last descriptor to be out
+                * of order relative to the descriptor list.
                 */
-               mount_unlock_renames(locked_mp);
-               mount_drop(locked_mp, 0);
-               holding_mntlock = 0;
+               if (j < desc_actual)
+                       desc_actual = j;
        }
-       if (error) {
-               if (to_name != NULL)
-                       release_pathbuff(to_name);
-               if (from_name != NULL)
-                       release_pathbuff(from_name);
-               from_name = to_name = NULL;
 
-               goto out1;
-       } 
-       
-       /* call out to allow 3rd party notification of rename. 
-        * Ignore result of kauth_authorize_fileop call.
+       /*
+        * We limit the actual number of descriptors we are willing to process
+        * to a hard maximum of ACCESSX_MAX_DESCRIPTORS.  If the number being
+        * requested does not exceed this limit,
         */
-       kauth_authorize_fileop(vfs_context_ucred(&context), KAUTH_FILEOP_RENAME, 
-                                                  (uintptr_t)from_name, (uintptr_t)to_name);
-
-       if (from_name != NULL && to_name != NULL) {
-               if (tvp) {
-                       add_fsevent(FSE_RENAME, &context,
-                                   FSE_ARG_STRING, from_len, from_name,
-                                   FSE_ARG_FINFO, &from_finfo,
-                                   FSE_ARG_STRING, to_len, to_name,
-                                   FSE_ARG_FINFO, &to_finfo,
-                                   FSE_ARG_DONE);
-               } else {
-                       add_fsevent(FSE_RENAME, &context,
-                                   FSE_ARG_STRING, from_len, from_name,
-                                   FSE_ARG_FINFO, &from_finfo,
-                                   FSE_ARG_STRING, to_len, to_name,
-                                   FSE_ARG_DONE);
-               }
+       if (desc_actual > ACCESSX_MAX_DESCRIPTORS) {
+               error = ENOMEM;
+               goto out;
+       }
+       MALLOC(result, errno_t *, desc_actual * sizeof(errno_t), M_TEMP, M_WAITOK | M_ZERO);
+       if (result == NULL) {
+               error = ENOMEM;
+               goto out;
        }
-       if (to_name != NULL)
-               release_pathbuff(to_name);
-       if (from_name != NULL)
-               release_pathbuff(from_name);
-       from_name = to_name = NULL;
-               
+
        /*
-        * update filesystem's mount point data
+        * Do the work by iterating over the descriptor entries we know to
+        * at least appear to contain valid data.
         */
-       if (mntrename) {
-               char *cp, *pathend, *mpname;
-               char * tobuf;
-               struct mount *mp;
-               int maxlen;
-               size_t len = 0;
-
-               mp = fvp->v_mountedhere;
-
-               if (vfs_busy(mp, LK_NOWAIT)) {
-                       error = EBUSY;
-                       goto out1;
-               }
-               MALLOC_ZONE(tobuf, char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
-
-               error = copyinstr(uap->to, tobuf, MAXPATHLEN, &len);
-               if (!error) {
-                       /* find current mount point prefix */
-                       pathend = &mp->mnt_vfsstat.f_mntonname[0];
-                       for (cp = pathend; *cp != '\0'; ++cp) {
-                               if (*cp == '/')
-                                       pathend = cp + 1;
+       error = 0;
+       for (i = 0; i < desc_actual; i++) {
+               /*
+                * If the ad_name_offset is 0, then we use the previous
+                * results to make the check; otherwise, we are looking up
+                * a new file name.
+                */
+               if (input[i].ad_name_offset != 0) {
+                       /* discard old vnodes */
+                       if (vp) {
+                               vnode_put(vp);
+                               vp = NULL;
                        }
-                       /* find last component of target name */
-                       for (mpname = cp = tobuf; *cp != '\0'; ++cp) {
-                               if (*cp == '/')
-                                       mpname = cp + 1;
+                       if (dvp) {
+                               vnode_put(dvp);
+                               dvp = NULL;
                        }
-                       /* append name to prefix */
-                       maxlen = MAXPATHLEN - (pathend - mp->mnt_vfsstat.f_mntonname);
-                       bzero(pathend, maxlen);
-                       strncpy(pathend, mpname, maxlen - 1);
-               }
-               FREE_ZONE(tobuf, MAXPATHLEN, M_NAMEI);
 
-               vfs_unbusy(mp);
-       }
-       /*
-        * fix up name & parent pointers.  note that we first   
-        * check that fvp has the same name/parent pointers it
-        * had before the rename call... this is a 'weak' check
-        * at best...
-        */
-       if (oname == fvp->v_name && oparent == fvp->v_parent) {
-               int update_flags;
+                       /*
+                        * Scan forward in the descriptor list to see if we
+                        * need the parent vnode.  We will need it if we are
+                        * deleting, since we must have rights  to remove
+                        * entries in the parent directory, as well as the
+                        * rights to delete the object itself.
+                        */
+                       wantdelete = input[i].ad_flags & _DELETE_OK;
+                       for (j = i + 1; (j < desc_actual) && (input[j].ad_name_offset == 0); j++)
+                               if (input[j].ad_flags & _DELETE_OK)
+                                       wantdelete = 1;
 
-               update_flags = VNODE_UPDATE_NAME;
+                       niopts = FOLLOW | AUDITVNPATH1;
 
-               if (fdvp != tdvp)
-                       update_flags |= VNODE_UPDATE_PARENT;
+                       /* need parent for vnode_authorize for deletion test */
+                       if (wantdelete)
+                               niopts |= WANTPARENT;
 
-               vnode_update_identity(fvp, tdvp, tond.ni_cnd.cn_nameptr, tond.ni_cnd.cn_namelen, tond.ni_cnd.cn_hash, update_flags);
-       }
-out1:
-       if (holding_mntlock) {
-               mount_unlock_renames(locked_mp);
-               mount_drop(locked_mp, 0);
-       }
-       if (tdvp) {
-               /*
-                * nameidone has to happen before we vnode_put(tdvp)
-                * since it may need to release the fs_nodelock on the tdvp
-                */
-               nameidone(&tond);
+                       /* do the lookup */
+                       NDINIT(&nd, LOOKUP, OP_ACCESS, niopts, UIO_SYSSPACE,
+                              CAST_USER_ADDR_T(((const char *)input) + input[i].ad_name_offset),
+                              &context);
+                       error = namei(&nd);
+                       if (!error) {
+                               vp = nd.ni_vp;
+                               if (wantdelete)
+                                       dvp = nd.ni_dvp;
+                       }
+                       nameidone(&nd);
+               }
 
-               if (tvp)
-                       vnode_put(tvp);
-               vnode_put(tdvp);
-       }
-       if (fdvp) {
                /*
-                * nameidone has to happen before we vnode_put(fdvp)
-                * since it may need to release the fs_nodelock on the fdvp
+                * Handle lookup errors.
                 */
-               nameidone(&fromnd);
+               switch(error) {
+               case ENOENT:
+               case EACCES:
+               case EPERM:
+               case ENOTDIR:
+                       result[i] = error;
+                       break;
+               case 0:
+                       /* run this access check */
+                       result[i] = access1(vp, dvp, input[i].ad_flags, &context);
+                       break;
+               default:
+                       /* fatal lookup error */
 
-               if (fvp)
-                       vnode_put(fvp);
-               vnode_put(fdvp);
+                       goto out;
+               }
        }
-       return (error);
+
+       AUDIT_ARG(data, result, sizeof(errno_t), desc_actual);
+
+       /* copy out results */
+       error = copyout(result, uap->results, desc_actual * sizeof(errno_t));
+
+out:
+       if (input && input != stack_input)
+               FREE(input, M_TEMP);
+       if (result)
+               FREE(result, M_TEMP);
+       if (vp)
+               vnode_put(vp);
+       if (dvp)
+               vnode_put(dvp);
+       if (IS_VALID_CRED(context.vc_ucred))
+               kauth_cred_unref(&context.vc_ucred);
+       return(error);
 }
 
+
 /*
- * Make a directory file.
+ * Returns:    0                       Success
+ *             namei:EFAULT            Bad address
+ *             namei:ENAMETOOLONG      Filename too long
+ *             namei:ENOENT            No such file or directory
+ *             namei:ELOOP             Too many levels of symbolic links
+ *             namei:EBADF             Bad file descriptor
+ *             namei:ENOTDIR           Not a directory
+ *             namei:???
+ *             access1:
  */
-/* ARGSUSED */
 static int
-mkdir1(vfs_context_t ctx, user_addr_t path, struct vnode_attr *vap)
+faccessat_internal(vfs_context_t ctx, int fd, user_addr_t path, int amode,
+    int flag, enum uio_seg segflg)
 {
-       vnode_t vp, dvp;
        int error;
-       int update_flags = 0;
        struct nameidata nd;
+       int niopts;
+       struct vfs_context context;
+#if NAMEDRSRCFORK
+       int is_namedstream = 0;
+#endif
 
-       AUDIT_ARG(mode, vap->va_mode);
-       NDINIT(&nd, CREATE, LOCKPARENT | AUDITVNPATH1, 
-               UIO_USERSPACE, path, ctx);
-       nd.ni_cnd.cn_flags |= WILLBEDIR;
-       error = namei(&nd);
-       if (error)
-               return (error);
-       dvp = nd.ni_dvp;
-       vp = nd.ni_vp;
+       /*
+        * Unless the AT_EACCESS option is used, Access is defined as checking
+        * against the process' real identity, even if operations are checking
+        * the effective identity.  So we need to tweak the credential
+        * in the context for that case.
+        */
+       if (!(flag & AT_EACCESS))
+               context.vc_ucred = kauth_cred_copy_real(kauth_cred_get());
+       else
+               context.vc_ucred = ctx->vc_ucred;
+       context.vc_thread = ctx->vc_thread;
 
-       if (vp != NULL) {
-               error = EEXIST;
-               goto out;
-       }
-   
-       /* authorize addition of a directory to the parent */
-       if ((error = vnode_authorize(dvp, NULL, KAUTH_VNODE_ADD_SUBDIRECTORY, ctx)) != 0)
-               goto out;
-       
-       VATTR_SET(vap, va_type, VDIR);
-   
-       /* make the directory */
-       if ((error = vn_create(dvp, &vp, &nd.ni_cnd, vap, 0, ctx)) != 0)
-               goto out;
-               
-       // Make sure the name & parent pointers are hooked up
-       if (vp->v_name == NULL)
-               update_flags |= VNODE_UPDATE_NAME;
-       if (vp->v_parent == NULLVP)
-               update_flags |= VNODE_UPDATE_PARENT;
 
-       if (update_flags)
-               vnode_update_identity(vp, dvp, nd.ni_cnd.cn_nameptr, nd.ni_cnd.cn_namelen, nd.ni_cnd.cn_hash, update_flags);
+       niopts = FOLLOW | AUDITVNPATH1;
+       /* need parent for vnode_authorize for deletion test */
+       if (amode & _DELETE_OK)
+               niopts |= WANTPARENT;
+       NDINIT(&nd, LOOKUP, OP_ACCESS, niopts, segflg,
+              path, &context);
 
-       add_fsevent(FSE_CREATE_DIR, ctx, FSE_ARG_VNODE, vp, FSE_ARG_DONE);
+#if NAMEDRSRCFORK
+       /* access(F_OK) calls are allowed for resource forks. */
+       if (amode == F_OK)
+               nd.ni_cnd.cn_flags |= CN_ALLOWRSRCFORK;
+#endif
+       error = nameiat(&nd, fd);
+       if (error)
+               goto out;
 
-out:
-       /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
+#if NAMEDRSRCFORK
+       /* Grab reference on the shadow stream file vnode to
+        * force an inactive on release which will mark it
+        * for recycle.
         */
-       nameidone(&nd);
+       if (vnode_isnamedstream(nd.ni_vp) &&
+           (nd.ni_vp->v_parent != NULLVP) &&
+           vnode_isshadow(nd.ni_vp)) {
+               is_namedstream = 1;
+               vnode_ref(nd.ni_vp);
+       }
+#endif
 
-       if (vp)
-               vnode_put(vp);
-       vnode_put(dvp);
+       error = access1(nd.ni_vp, nd.ni_dvp, amode, &context);
+
+#if NAMEDRSRCFORK
+       if (is_namedstream) {
+               vnode_rele(nd.ni_vp);
+       }
+#endif
+
+       vnode_put(nd.ni_vp);
+       if (amode & _DELETE_OK)
+               vnode_put(nd.ni_dvp);
+       nameidone(&nd);
 
+out:
+       if (!(flag & AT_EACCESS))
+               kauth_cred_unref(&context.vc_ucred);
        return (error);
 }
 
-
 int
-mkdir_extended(struct proc *p, register struct mkdir_extended_args *uap, __unused register_t *retval)
+access(__unused proc_t p, struct access_args *uap, __unused int32_t *retval)
 {
-       struct vfs_context context;
-       int ciferror;
-       kauth_filesec_t xsecdst;
-       struct vnode_attr va;
-
-       xsecdst = NULL;
-       if ((uap->xsecurity != USER_ADDR_NULL) &&
-           ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0))
-               return ciferror;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_mode, (uap->mode & ACCESSPERMS) & ~p->p_fd->fd_cmask);
-       if (xsecdst != NULL)
-               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
-
-       ciferror = mkdir1(&context, uap->path, &va);
-       if (xsecdst != NULL)
-               kauth_filesec_free(xsecdst);
-       return ciferror;
+       return (faccessat_internal(vfs_context_current(), AT_FDCWD,
+           uap->path, uap->flags, 0, UIO_USERSPACE));
 }
 
 int
-mkdir(struct proc *p, register struct mkdir_args *uap, __unused register_t *retval)
+faccessat(__unused proc_t p, struct faccessat_args *uap,
+          __unused int32_t *retval)
 {
-       struct vfs_context context;
-       struct vnode_attr va;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       VATTR_INIT(&va);
-       VATTR_SET(&va, va_mode, (uap->mode & ACCESSPERMS) & ~p->p_fd->fd_cmask);
+       if (uap->flag & ~AT_EACCESS)
+               return (EINVAL);
 
-       return(mkdir1(&context, uap->path, &va));
+       return (faccessat_internal(vfs_context_current(), uap->fd,
+           uap->path, uap->amode, uap->flag, UIO_USERSPACE));
 }
 
 /*
- * Remove a directory file.
+ * Returns:    0                       Success
+ *             EFAULT
+ *     copyout:EFAULT
+ *     namei:???
+ *     vn_stat:???
  */
-/* ARGSUSED */
-int
-rmdir(struct proc *p, struct rmdir_args *uap, __unused register_t *retval)
+static int
+fstatat_internal(vfs_context_t ctx, user_addr_t path, user_addr_t ub,
+    user_addr_t xsecurity, user_addr_t xsecurity_size, int isstat64,
+    enum uio_seg segflg, int fd, int flag)
 {
-        vnode_t vp, dvp;
-       int error;
        struct nameidata nd;
-       struct vfs_context context;
-       
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       int follow;
+       union {
+               struct stat sb;
+               struct stat64 sb64;
+       } source = {};
+       union {
+               struct user64_stat user64_sb;
+               struct user32_stat user32_sb;
+               struct user64_stat64 user64_sb64;
+               struct user32_stat64 user32_sb64;
+       } dest = {};
+       caddr_t sbp;
+       int error, my_size;
+       kauth_filesec_t fsec;
+       size_t xsecurity_bufsize;
+       void * statptr;
 
-       NDINIT(&nd, DELETE, LOCKPARENT | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
+       follow = (flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_GETATTR, follow | AUDITVNPATH1,
+           segflg, path, ctx);
+
+#if NAMEDRSRCFORK
+       int is_namedstream = 0;
+       /* stat calls are allowed for resource forks. */
+       nd.ni_cnd.cn_flags |= CN_ALLOWRSRCFORK;
+#endif
+       error = nameiat(&nd, fd);
        if (error)
                return (error);
-       dvp = nd.ni_dvp;
-       vp = nd.ni_vp;
+       fsec = KAUTH_FILESEC_NONE;
 
-       if (vp->v_type != VDIR) {
-               /*
-                * rmdir only deals with directories
-                */
-               error = ENOTDIR;
-       } else if (dvp == vp) {
-               /*
-                * No rmdir "." please.
-                */
-               error = EINVAL;
-       } else if (vp->v_flag & VROOT) {
-               /*
-                * The root of a mounted filesystem cannot be deleted.
-                */
-               error = EBUSY;
-       } else {
-               error = vnode_authorize(vp, nd.ni_dvp, KAUTH_VNODE_DELETE, &context);
-       }
-       if (!error) {
-               char     *path = NULL;
-               int       len;
-               fse_info  finfo;
-               
-               if (need_fsevent(FSE_DELETE, dvp)) {
-                       path = get_pathbuff();
-                       len = MAXPATHLEN;
-                       vn_getpath(vp, path, &len);
-                       get_fse_info(vp, &finfo, &context);
-               }
-               error = VNOP_RMDIR(dvp, vp, &nd.ni_cnd, &context);
+       statptr = (void *)&source;
 
-               if (!error && path != NULL) {
-                       add_fsevent(FSE_DELETE, &context,
-                               FSE_ARG_STRING, len, path,
-                               FSE_ARG_FINFO, &finfo,
-                               FSE_ARG_DONE);
-               }
-               if (path != NULL)
-                       release_pathbuff(path);
-       }
-       /*
-        * nameidone has to happen before we vnode_put(dvp)
-        * since it may need to release the fs_nodelock on the dvp
+#if NAMEDRSRCFORK
+       /* Grab reference on the shadow stream file vnode to
+        * force an inactive on release which will mark it
+        * for recycle.
         */
-       nameidone(&nd);
-
-       vnode_put(dvp);
-       vnode_put(vp);
-
-       return (error);
-}
+       if (vnode_isnamedstream(nd.ni_vp) &&
+           (nd.ni_vp->v_parent != NULLVP) &&
+           vnode_isshadow(nd.ni_vp)) {
+               is_namedstream = 1;
+               vnode_ref(nd.ni_vp);
+       }
+#endif
 
+       error = vn_stat(nd.ni_vp, statptr, (xsecurity != USER_ADDR_NULL ? &fsec : NULL), isstat64, ctx);
 
-/*
- * Read a block of directory entries in a file system independent format.
- */
-int
-getdirentries(p, uap, retval)
-       struct proc *p;
-       register struct getdirentries_args *uap;
-       register_t *retval;
-{
-       struct vnode *vp;
-       struct vfs_context context;
-       struct fileproc *fp;
-       uio_t auio;
-       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       long loff;
-       int error, eofflag;
-       int fd = uap->fd;
-       char uio_buf[ UIO_SIZEOF(1) ];
+#if NAMEDRSRCFORK
+       if (is_namedstream) {
+               vnode_rele(nd.ni_vp);
+       }
+#endif
+       vnode_put(nd.ni_vp);
+       nameidone(&nd);
 
-       AUDIT_ARG(fd, uap->fd);
-       error = fp_getfvp(p, fd, &fp, &vp);
        if (error)
                return (error);
+       /* Zap spare fields */
+       if (isstat64 != 0) {
+               source.sb64.st_lspare = 0;
+               source.sb64.st_qspare[0] = 0LL;
+               source.sb64.st_qspare[1] = 0LL;
+               if (IS_64BIT_PROCESS(vfs_context_proc(ctx))) {
+                       munge_user64_stat64(&source.sb64, &dest.user64_sb64);
+                       my_size = sizeof(dest.user64_sb64);
+                       sbp = (caddr_t)&dest.user64_sb64;
+               } else {
+                       munge_user32_stat64(&source.sb64, &dest.user32_sb64);
+                       my_size = sizeof(dest.user32_sb64);
+                       sbp = (caddr_t)&dest.user32_sb64;
+               }
+               /*
+                * Check if we raced (post lookup) against the last unlink of a file.
+                */
+               if ((source.sb64.st_nlink == 0) && S_ISREG(source.sb64.st_mode)) {
+                       source.sb64.st_nlink = 1;
+               }
+       } else {
+               source.sb.st_lspare = 0;
+               source.sb.st_qspare[0] = 0LL;
+               source.sb.st_qspare[1] = 0LL;
+               if (IS_64BIT_PROCESS(vfs_context_proc(ctx))) {
+                       munge_user64_stat(&source.sb, &dest.user64_sb);
+                       my_size = sizeof(dest.user64_sb);
+                       sbp = (caddr_t)&dest.user64_sb;
+               } else {
+                       munge_user32_stat(&source.sb, &dest.user32_sb);
+                       my_size = sizeof(dest.user32_sb);
+                       sbp = (caddr_t)&dest.user32_sb;
+               }
 
-       if ((fp->f_fglob->fg_flag & FREAD) == 0) {
-               AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
-               error = EBADF;
-               goto out;
-       }
-       if ( (error = vnode_getwithref(vp)) ) {
-               goto out;
-       }
-
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
-
-unionread:
-       if (vp->v_type != VDIR) {
-               (void)vnode_put(vp);
-               error = EINVAL;
-               goto out;
+               /*
+                * Check if we raced (post lookup) against the last unlink of a file.
+                */
+               if ((source.sb.st_nlink == 0) && S_ISREG(source.sb.st_mode)) {
+                       source.sb.st_nlink = 1;
+               }
        }
-       context.vc_proc = p;
-       context.vc_ucred = fp->f_fglob->fg_cred;
-
-       loff = fp->f_fglob->fg_offset;
-       auio = uio_createwithbuffer(1, loff, spacetype, UIO_READ, 
-                                                                 &uio_buf[0], sizeof(uio_buf));
-       uio_addiov(auio, uap->buf, uap->count);
-
-       error = VNOP_READDIR(vp, auio, 0, &eofflag, (int *)NULL, &context);
-       fp->f_fglob->fg_offset = uio_offset(auio);
-       if (error) {
-               (void)vnode_put(vp);
+       if ((error = copyout(sbp, ub, my_size)) != 0)
                goto out;
-       }
 
-#if UNION
-{
-       if ((uap->count == uio_resid(auio)) &&
-           (vp->v_op == union_vnodeop_p)) {
-               struct vnode *lvp;
+       /* caller wants extended security information? */
+       if (xsecurity != USER_ADDR_NULL) {
 
-               lvp = union_dircache(vp, p);
-               if (lvp != NULLVP) {
-                       struct vnode_attr va;
-                       /*
-                        * If the directory is opaque,
-                        * then don't show lower entries
-                        */
-                       VATTR_INIT(&va);
-                       VATTR_WANTED(&va, va_flags);
-                       error = vnode_getattr(vp, &va, &context);
-                       if (va.va_flags & OPAQUE) {
-                               vnode_put(lvp);
-                               lvp = NULL;
+               /* did we get any? */
+               if (fsec == KAUTH_FILESEC_NONE) {
+                       if (susize(xsecurity_size, 0) != 0) {
+                               error = EFAULT;
+                               goto out;
                        }
-               }
+               } else {
+                       /* find the user buffer size */
+                       xsecurity_bufsize = fusize(xsecurity_size);
 
-               if (lvp != NULLVP) {
-                       error = VNOP_OPEN(lvp, FREAD, &context);
-                       if (error) {
-                               vnode_put(lvp);
+                       /* copy out the actual data size */
+                       if (susize(xsecurity_size, KAUTH_FILESEC_COPYSIZE(fsec)) != 0) {
+                               error = EFAULT;
                                goto out;
                        }
-                       vnode_ref(lvp);
-                       fp->f_fglob->fg_data = (caddr_t) lvp;
-                       fp->f_fglob->fg_offset = 0;
-                       error = VNOP_CLOSE(vp, FREAD, &context);
-                       vnode_rele(vp);
-                       vnode_put(vp);
-                       if (error)
-                               goto out;
-                       vp = lvp;
-                       goto unionread;
-               }
-       }
-}
-#endif /* UNION */
 
-       if (((user_ssize_t)uap->count == uio_resid(auio)) &&
-           (vp->v_flag & VROOT) &&
-           (vp->v_mount->mnt_flag & MNT_UNION)) {
-               struct vnode *tvp = vp;
-               vp = vp->v_mount->mnt_vnodecovered;
-               vnode_getwithref(vp);
-               vnode_ref(vp);
-               fp->f_fglob->fg_data = (caddr_t) vp;
-               fp->f_fglob->fg_offset = 0;
-               vnode_rele(tvp);
-               vnode_put(tvp);
-               goto unionread;
+                       /* if the caller supplied enough room, copy out to it */
+                       if (xsecurity_bufsize >= KAUTH_FILESEC_COPYSIZE(fsec))
+                               error = copyout(fsec, xsecurity, KAUTH_FILESEC_COPYSIZE(fsec));
+               }
        }
-       vnode_put(vp);
-       error = copyout((caddr_t)&loff, uap->basep, sizeof(long));
-       // LP64todo - fix this
-       *retval = uap->count - uio_resid(auio);
 out:
-       file_drop(fd);
+       if (fsec != KAUTH_FILESEC_NONE)
+               kauth_filesec_free(fsec);
        return (error);
 }
 
 /*
- * Set the mode mask for creation of filesystem nodes.
+ * stat_extended: Get file status; with extended security (ACL).
+ *
+ * Parameters:    p                       (ignored)
+ *                uap                     User argument descriptor (see below)
+ *                retval                  (ignored)
+ *
+ * Indirect:      uap->path               Path of file to get status from
+ *                uap->ub                 User buffer (holds file status info)
+ *                uap->xsecurity          ACL to get (extended security)
+ *                uap->xsecurity_size     Size of ACL
+ *
+ * Returns:        0                      Success
+ *                !0                      errno value
+ *
  */
-#warning XXX implement xsecurity
-
-#define UMASK_NOXSECURITY       (void *)1      /* leave existing xsecurity alone */
-static int
-umask1(struct proc *p, int newmask, __unused kauth_filesec_t fsec, register_t *retval)
+int
+stat_extended(__unused proc_t p, struct stat_extended_args *uap,
+    __unused int32_t *retval)
 {
-       register struct filedesc *fdp;
-
-       AUDIT_ARG(mask, newmask);
-       fdp = p->p_fd;
-       *retval = fdp->fd_cmask;
-       fdp->fd_cmask = newmask & ALLPERMS;
-       return (0);
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           uap->xsecurity, uap->xsecurity_size, 0, UIO_USERSPACE, AT_FDCWD,
+           0));
 }
 
-
+/*
+ * Returns:    0                       Success
+ *     fstatat_internal:???            [see fstatat_internal() in this file]
+ */
 int
-umask_extended(struct proc *p, struct umask_extended_args *uap, register_t *retval)
+stat(__unused proc_t p, struct stat_args *uap, __unused int32_t *retval)
 {
-       int ciferror;
-       kauth_filesec_t xsecdst;
-
-       xsecdst = KAUTH_FILESEC_NONE;
-       if (uap->xsecurity != USER_ADDR_NULL) {
-               if ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
-                       return ciferror;
-       } else {
-               xsecdst = KAUTH_FILESEC_NONE;
-       }
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           0, 0, 0, UIO_USERSPACE, AT_FDCWD, 0));
+}
 
-       ciferror = umask1(p, uap->newmask, xsecdst, retval);
+int
+stat64(__unused proc_t p, struct stat64_args *uap, __unused int32_t *retval)
+{
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           0, 0, 1, UIO_USERSPACE, AT_FDCWD, 0));
+}
 
-       if (xsecdst != KAUTH_FILESEC_NONE)
-               kauth_filesec_free(xsecdst);
-       return ciferror;
+/*
+ * stat64_extended: Get file status; can handle large inode numbers; with extended security (ACL).
+ *
+ * Parameters:    p                       (ignored)
+ *                uap                     User argument descriptor (see below)
+ *                retval                  (ignored)
+ *
+ * Indirect:      uap->path               Path of file to get status from
+ *                uap->ub                 User buffer (holds file status info)
+ *                uap->xsecurity          ACL to get (extended security)
+ *                uap->xsecurity_size     Size of ACL
+ *
+ * Returns:        0                      Success
+ *                !0                      errno value
+ *
+ */
+int
+stat64_extended(__unused proc_t p, struct stat64_extended_args *uap, __unused int32_t *retval)
+{
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           uap->xsecurity, uap->xsecurity_size, 1, UIO_USERSPACE, AT_FDCWD,
+           0));
 }
 
+/*
+ * lstat_extended: Get file status; does not follow links; with extended security (ACL).
+ *
+ * Parameters:    p                       (ignored)
+ *                uap                     User argument descriptor (see below)
+ *                retval                  (ignored)
+ *
+ * Indirect:      uap->path               Path of file to get status from
+ *                uap->ub                 User buffer (holds file status info)
+ *                uap->xsecurity          ACL to get (extended security)
+ *                uap->xsecurity_size     Size of ACL
+ *
+ * Returns:        0                      Success
+ *                !0                      errno value
+ *
+ */
 int
-umask(struct proc *p, struct umask_args *uap, register_t *retval)
+lstat_extended(__unused proc_t p, struct lstat_extended_args *uap, __unused int32_t *retval)
 {
-       return(umask1(p, uap->newmask, UMASK_NOXSECURITY, retval));
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           uap->xsecurity, uap->xsecurity_size, 0, UIO_USERSPACE, AT_FDCWD,
+           AT_SYMLINK_NOFOLLOW));
 }
 
 /*
- * Void all references to file by ripping underlying filesystem
- * away from vnode.
+ * Get file status; this version does not follow links.
  */
-/* ARGSUSED */
 int
-revoke(struct proc *p, register struct revoke_args *uap, __unused register_t *retval)
+lstat(__unused proc_t p, struct lstat_args *uap, __unused int32_t *retval)
 {
-       register struct vnode *vp;
-       struct vnode_attr va;
-       struct vfs_context context;
-       int error;
-       struct nameidata nd;
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           0, 0, 0, UIO_USERSPACE, AT_FDCWD, AT_SYMLINK_NOFOLLOW));
+}
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
-       error = namei(&nd);
-       if (error)
-               return (error);
-       vp = nd.ni_vp;
-
-       nameidone(&nd);
-
-       VATTR_INIT(&va);
-       VATTR_WANTED(&va, va_uid);
-       if ((error = vnode_getattr(vp, &va, &context)))
-               goto out;
-       if (kauth_cred_getuid(context.vc_ucred) != va.va_uid &&
-           (error = suser(context.vc_ucred, &p->p_acflag)))
-               goto out;
-       if (vp->v_usecount > 1 || (vp->v_flag & VALIASED))
-               VNOP_REVOKE(vp, REVOKEALL, &context);
-out:
-       vnode_put(vp);
-       return (error);
-}
-
-
-/*
- *  HFS/HFS PlUS SPECIFIC SYSTEM CALLS
- *  The following system calls are designed to support features
- *  which are specific to the HFS & HFS Plus volume formats
- */
-
-#ifdef __APPLE_API_OBSOLETE
-
-/************************************************/
-/* *** Following calls will be deleted soon *** */
-/************************************************/
+int
+lstat64(__unused proc_t p, struct lstat64_args *uap, __unused int32_t *retval)
+{
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           0, 0, 1, UIO_USERSPACE, AT_FDCWD, AT_SYMLINK_NOFOLLOW));
+}
 
 /*
- * Make a complex file.  A complex file is one with multiple forks (data streams)
+ * lstat64_extended: Get file status; can handle large inode numbers; does not
+ * follow links; with extended security (ACL).
+ *
+ * Parameters:    p                       (ignored)
+ *                uap                     User argument descriptor (see below)
+ *                retval                  (ignored)
+ *
+ * Indirect:      uap->path               Path of file to get status from
+ *                uap->ub                 User buffer (holds file status info)
+ *                uap->xsecurity          ACL to get (extended security)
+ *                uap->xsecurity_size     Size of ACL
+ *
+ * Returns:        0                      Success
+ *                !0                      errno value
+ *
  */
-/* ARGSUSED */
 int
-mkcomplex(__unused struct proc *p, __unused struct mkcomplex_args *uap, __unused register_t *retval)
+lstat64_extended(__unused proc_t p, struct lstat64_extended_args *uap, __unused int32_t *retval)
 {
-       return (ENOTSUP);
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           uap->xsecurity, uap->xsecurity_size, 1, UIO_USERSPACE, AT_FDCWD,
+           AT_SYMLINK_NOFOLLOW));
 }
 
-/*
- * Extended stat call which returns volumeid and vnodeid as well as other info
- */
-/* ARGSUSED */
 int
-statv(__unused struct proc *p,
-         __unused struct statv_args *uap,
-         __unused register_t *retval)
+fstatat(__unused proc_t p, struct fstatat_args *uap, __unused int32_t *retval)
 {
-       return (ENOTSUP);       /*  We'll just return an error for now */
+       if (uap->flag & ~AT_SYMLINK_NOFOLLOW)
+               return (EINVAL);
 
-} /* end of statv system call */
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           0, 0, 0, UIO_USERSPACE, uap->fd, uap->flag));
+}
 
-/*
-* Extended lstat call which returns volumeid and vnodeid as well as other info
-*/
-/* ARGSUSED */
 int
-lstatv(__unused struct proc *p,
-          __unused struct lstatv_args *uap,
-          __unused register_t *retval)
+fstatat64(__unused proc_t p, struct fstatat64_args *uap,
+    __unused int32_t *retval)
 {
-       return (ENOTSUP);       /*  We'll just return an error for now */
-} /* end of lstatv system call */
+       if (uap->flag & ~AT_SYMLINK_NOFOLLOW)
+               return (EINVAL);
+
+       return (fstatat_internal(vfs_context_current(), uap->path, uap->ub,
+           0, 0, 1, UIO_USERSPACE, uap->fd, uap->flag));
+}
 
 /*
-* Extended fstat call which returns volumeid and vnodeid as well as other info
-*/
+ * Get configurable pathname variables.
+ *
+ * Returns:    0                       Success
+ *     namei:???
+ *     vn_pathconf:???
+ *
+ * Notes:      Global implementation  constants are intended to be
+ *             implemented in this function directly; all other constants
+ *             are per-FS implementation, and therefore must be handled in
+ *             each respective FS, instead.
+ *
+ * XXX We implement some things globally right now that should actually be
+ * XXX per-FS; we will need to deal with this at some point.
+ */
 /* ARGSUSED */
 int
-fstatv(__unused struct proc *p, 
-          __unused struct fstatv_args *uap, 
-          __unused register_t *retval)
+pathconf(__unused proc_t p, struct pathconf_args *uap, int32_t *retval)
 {
-       return (ENOTSUP);       /*  We'll just return an error for now */
-} /* end of fstatv system call */
+       int error;
+       struct nameidata nd;
+       vfs_context_t ctx = vfs_context_current();
 
+       NDINIT(&nd, LOOKUP, OP_PATHCONF, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       error = namei(&nd);
+       if (error)
+               return (error);
 
-/************************************************/
-/* *** Preceding calls will be deleted soon *** */
-/************************************************/
+       error = vn_pathconf(nd.ni_vp, uap->name, retval, ctx);
 
-#endif /* __APPLE_API_OBSOLETE */
+       vnode_put(nd.ni_vp);
+       nameidone(&nd);
+       return (error);
+}
 
 /*
-* Obtain attribute information on objects in a directory while enumerating
-* the directory.  This call does not yet support union mounted directories.
-* TO DO
-*  1.union mounted directories.
-*/
-
+ * Return target name of a symbolic link.
+ */
 /* ARGSUSED */
-int
-getdirentriesattr (struct proc *p, struct getdirentriesattr_args *uap, register_t *retval)
+static int
+readlinkat_internal(vfs_context_t ctx, int fd, user_addr_t path,
+    enum uio_seg seg, user_addr_t buf, size_t bufsize, enum uio_seg bufseg,
+    int *retval)
 {
-       struct vnode *vp;
-       struct fileproc *fp;
-       uio_t auio = NULL;
-       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       uint64_t actualcount;
-       u_long tmpcount;
-       u_long newstate;
-       int error, eofflag;
-       u_long loff;
-       struct attrlist attributelist; 
-       struct vfs_context context;
-       int fd = uap->fd;
+       vnode_t vp;
+       uio_t auio;
+       int error;
+       struct nameidata nd;
        char uio_buf[ UIO_SIZEOF(1) ];
-       kauth_action_t action;
 
-       AUDIT_ARG(fd, fd);
-    
-       /* Get the attributes into kernel space */
-       if ((error = copyin(uap->alist, (caddr_t) &attributelist, sizeof (attributelist))))
-               return(error);
-       actualcount = fuulong(uap->count);
-       if (actualcount == -1ULL)
-               return(-1);
+       NDINIT(&nd, LOOKUP, OP_READLINK, NOFOLLOW | AUDITVNPATH1,
+           seg, path, ctx);
 
-       if ( (error = fp_getfvp(p, fd, &fp, &vp)) )
+       error = nameiat(&nd, fd);
+       if (error)
                return (error);
+       vp = nd.ni_vp;
 
-       if ((fp->f_fglob->fg_flag & FREAD) == 0) {
-               AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
-               error = EBADF;
-               goto out;
-       }
-       if ( (error = vnode_getwithref(vp)) )
-               goto out;
-
-       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+       nameidone(&nd);
 
-       if (vp->v_type != VDIR) {
-               (void)vnode_put(vp);
+       auio = uio_createwithbuffer(1, 0, bufseg, UIO_READ,
+                                    &uio_buf[0], sizeof(uio_buf));
+       uio_addiov(auio, buf, bufsize);
+       if (vp->v_type != VLNK) {
                error = EINVAL;
-               goto out;
+       } else {
+#if CONFIG_MACF
+               error = mac_vnode_check_readlink(ctx, vp);
+#endif
+               if (error == 0)
+                       error = vnode_authorize(vp, NULL, KAUTH_VNODE_READ_DATA,
+                                               ctx);
+               if (error == 0)
+                       error = VNOP_READLINK(vp, auio, ctx);
        }
+       vnode_put(vp);
 
-       /* set up the uio structure which will contain the users return buffer */
-       loff = fp->f_fglob->fg_offset;
-       auio = uio_createwithbuffer(1, loff, spacetype, UIO_READ, 
-           &uio_buf[0], sizeof(uio_buf));
-       uio_addiov(auio, uap->buffer, uap->buffersize);
-       
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-       tmpcount = (u_long) actualcount;
-
-       /*
-        * If the only item requested is file names, we can let that past with
-        * just LIST_DIRECTORY.  If they want any other attributes, that means
-        * they need SEARCH as well.
-        */
-       action = KAUTH_VNODE_LIST_DIRECTORY;
-       if ((attributelist.commonattr & ~ATTR_CMN_NAME) ||
-           attributelist.fileattr || attributelist.dirattr)
-               action |= KAUTH_VNODE_SEARCH;
-       
-       if ((error = vnode_authorize(vp, NULL, action, &context)) == 0)
-               error = VNOP_READDIRATTR(vp, &attributelist, auio,
-                   tmpcount, uap->options, &newstate, &eofflag,
-                   &tmpcount, &context);
-       (void)vnode_put(vp);
-       actualcount = tmpcount;
-
-       if (error) 
-               goto out;
-       fp->f_fglob->fg_offset = uio_offset(auio); /* should be multiple of dirent, not variable */
-
-       if ((error = suulong(uap->count, actualcount)) != 0)
-               goto out;
-       if ((error = suulong(uap->newstate, (uint64_t)newstate)) != 0)
-               goto out;
-       if ((error = suulong(uap->basep, (uint64_t)loff)) != 0)
-               goto out;
-
-       *retval = eofflag;  /* similar to getdirentries */
-       error = 0;
-       out:
-       file_drop(fd);
-       return (error); /* return error earlier, an retval of 0 or 1 now */
-
-} /* end of getdirentryattr system call */
-
-/*
-* Exchange data between two files
-*/
+       *retval = bufsize - (int)uio_resid(auio);
+       return (error);
+}
 
-/* ARGSUSED */
 int
-exchangedata (struct proc *p, register struct exchangedata_args *uap, __unused register_t *retval)
+readlink(proc_t p, struct readlink_args *uap, int32_t *retval)
 {
+       enum uio_seg procseg;
 
-       struct nameidata fnd, snd;
-       struct vfs_context context;
-       struct vnode *fvp, *svp;
-    int error;
-       u_long nameiflags;
-       char *fpath = NULL;
-       char *spath = NULL;
-       int   flen, slen;
-       fse_info f_finfo, s_finfo;
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
-
-       nameiflags = 0;
-       if ((uap->options & FSOPT_NOFOLLOW) == 0) nameiflags |= FOLLOW;
-
-    NDINIT(&fnd, LOOKUP, nameiflags | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path1, &context);
+       procseg = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       return (readlinkat_internal(vfs_context_current(), AT_FDCWD,
+           CAST_USER_ADDR_T(uap->path), procseg, CAST_USER_ADDR_T(uap->buf),
+           uap->count, procseg, retval));
+}
 
-    error = namei(&fnd);
-    if (error)
-        goto out2;
+int
+readlinkat(proc_t p, struct readlinkat_args *uap, int32_t *retval)
+{
+       enum uio_seg procseg;
 
-       nameidone(&fnd);
-       fvp = fnd.ni_vp;
+       procseg = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       return (readlinkat_internal(vfs_context_current(), uap->fd, uap->path,
+           procseg, uap->buf, uap->bufsize, procseg, retval));
+}
 
-    NDINIT(&snd, LOOKUP, nameiflags | AUDITVNPATH2, 
-               UIO_USERSPACE, uap->path2, &context);
+/*
+ * Change file flags.
+ *
+ * NOTE: this will vnode_put() `vp'
+ */
+static int
+chflags1(vnode_t vp, int flags, vfs_context_t ctx)
+{
+       struct vnode_attr va;
+       kauth_action_t action;
+       int error;
 
-    error = namei(&snd);
-    if (error) {
-               vnode_put(fvp);
-               goto out2;
-    }
-       nameidone(&snd);
-       svp = snd.ni_vp;
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_flags, flags);
 
-       /*
-        * if the files are the same, return an inval error
-        */
-       if (svp == fvp) {
-               error = EINVAL;
+#if CONFIG_MACF
+       error = mac_vnode_check_setflags(ctx, vp, flags);
+       if (error)
                goto out;
-       } 
+#endif
 
+       /* request authorisation, disregard immutability */
+       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0)
+               goto out;
        /*
-        * if the files are on different volumes, return an error
+        * Request that the auth layer disregard those file flags it's allowed to when
+        * authorizing this operation; we need to do this in order to be able to
+        * clear immutable flags.
         */
-       if (svp->v_mount != fvp->v_mount) {
-               error = EXDEV;
-               goto out;
-       }
-       if (((error = vnode_authorize(fvp, NULL, KAUTH_VNODE_READ_DATA | KAUTH_VNODE_WRITE_DATA, &context)) != 0) ||
-           ((error = vnode_authorize(svp, NULL, KAUTH_VNODE_READ_DATA | KAUTH_VNODE_WRITE_DATA, &context)) != 0))
+       if (action && ((error = vnode_authorize(vp, NULL, action | KAUTH_VNODE_NOIMMUTABLE, ctx)) != 0))
                goto out;
+       error = vnode_setattr(vp, &va, ctx);
 
-       if (need_fsevent(FSE_EXCHANGE, fvp) || kauth_authorize_fileop_has_listeners()) {
-               fpath = get_pathbuff();
-               spath = get_pathbuff();
-               flen = MAXPATHLEN;
-               slen = MAXPATHLEN;
-               if (vn_getpath(fvp, fpath, &flen) != 0 || fpath[0] == '\0') {
-                       printf("exchange: vn_getpath(fvp=0x%x) failed <<%s>>\n",
-                              fvp, fpath);
-               }
-               if (vn_getpath(svp, spath, &slen) != 0 || spath[0] == '\0') {
-                       printf("exchange: vn_getpath(svp=0x%x) failed <<%s>>\n",
-                              svp, spath);
-               }
-               get_fse_info(fvp, &f_finfo, &context);
-               get_fse_info(svp, &s_finfo, &context);
-       }
-       /* Ok, make the call */
-       error = VNOP_EXCHANGE(fvp, svp, 0, &context);
-
-       if (error == 0) {
-           char *tmpname;
-
-           if (fpath != NULL && spath != NULL) {
-                   /* call out to allow 3rd party notification of exchangedata. 
-                    * Ignore result of kauth_authorize_fileop call.
-                    */
-                   kauth_authorize_fileop(vfs_context_ucred(&context), KAUTH_FILEOP_EXCHANGE, 
-                                          (uintptr_t)fpath, (uintptr_t)spath);
-           }
-           name_cache_lock();
-
-           tmpname     = fvp->v_name;
-           fvp->v_name = svp->v_name;
-           svp->v_name = tmpname;
-           
-           if (fvp->v_parent != svp->v_parent) {
-               struct vnode *tmp;
-
-               tmp           = fvp->v_parent;
-               fvp->v_parent = svp->v_parent;
-               svp->v_parent = tmp;
-           }
-           name_cache_unlock();
+#if CONFIG_MACF
+       if (error == 0)
+               mac_vnode_notify_setflags(ctx, vp, flags);
+#endif
 
-           if (fpath != NULL && spath != NULL) {
-                   add_fsevent(FSE_EXCHANGE, &context,
-                               FSE_ARG_STRING, flen, fpath,
-                               FSE_ARG_FINFO, &f_finfo,
-                               FSE_ARG_STRING, slen, spath,
-                               FSE_ARG_FINFO, &s_finfo,
-                               FSE_ARG_DONE);
-           }
+       if ((error == 0) && !VATTR_IS_SUPPORTED(&va, va_flags)) {
+               error = ENOTSUP;
        }
-       if (spath != NULL)
-               release_pathbuff(spath);
-       if (fpath != NULL)
-               release_pathbuff(fpath);
-
 out:
-       vnode_put(svp);
-       vnode_put(fvp);
-out2:
-        return (error);
+       vnode_put(vp);
+       return(error);
 }
 
-
-#ifdef __APPLE_API_OBSOLETE
-
-/************************************************/
-/* *** Following calls will be deleted soon *** */
-/************************************************/
-
 /*
-* Check users access to a file 
-*/
-
+ * Change flags of a file given a path name.
+ */
 /* ARGSUSED */
-#warning "checkuseraccess copies a cred in from user space but"
-#warning "user space has no way of knowing what one looks like"
-#warning "this code should use the access_extended spoof-as functionality"
 int
-checkuseraccess (struct proc *p, register struct checkuseraccess_args *uap, __unused register_t *retval)
+chflags(__unused proc_t p, struct chflags_args *uap, __unused int32_t *retval)
 {
-       register struct vnode *vp;
+       vnode_t vp;
+       vfs_context_t ctx = vfs_context_current();
        int error;
        struct nameidata nd;
-       struct ucred cred;      /* XXX ILLEGAL */
-       int flags;              /*what will actually get passed to access*/
-       u_long nameiflags;
-       struct vfs_context context;
-
-       /* Make sure that the number of groups is correct before we do anything */
-
-       if ((uap->ngroups <=  0) || (uap->ngroups > NGROUPS))
-               return (EINVAL);
-
-       /* Verify that the caller is root */
-       
-       if ((error = suser(kauth_cred_get(), &p->p_acflag)))
-               return(error);
 
-       /* Fill in the credential structure */
-
-       cred.cr_ref = 0;
-       cred.cr_uid = uap->userid;
-       cred.cr_ngroups = uap->ngroups;
-       if ((error = copyin(CAST_USER_ADDR_T(uap->groups), (caddr_t) &(cred.cr_groups), (sizeof(gid_t))*uap->ngroups)))
+       AUDIT_ARG(fflags, uap->flags);
+       NDINIT(&nd, LOOKUP, OP_SETATTR, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       error = namei(&nd);
+       if (error)
                return (error);
+       vp = nd.ni_vp;
+       nameidone(&nd);
 
-       context.vc_proc = p;
-       context.vc_ucred = &cred;
+       /* we don't vnode_put() here because chflags1 does internally */
+       error = chflags1(vp, uap->flags, ctx);
 
-       /* Get our hands on the file */
-       nameiflags = 0;
-       if ((uap->options & FSOPT_NOFOLLOW) == 0) nameiflags |= FOLLOW;
-       NDINIT(&nd, LOOKUP, nameiflags | AUDITVNPATH1, 
-               UIO_USERSPACE, CAST_USER_ADDR_T(uap->path), &context);
+       return(error);
+}
 
-       if ((error = namei(&nd)))
-                        return (error);
-       nameidone(&nd);
-       vp = nd.ni_vp;
-       
-       /* Flags == 0 means only check for existence. */
+/*
+ * Change flags of a file given a file descriptor.
+ */
+/* ARGSUSED */
+int
+fchflags(__unused proc_t p, struct fchflags_args *uap, __unused int32_t *retval)
+{
+       vnode_t vp;
+       int error;
 
-       flags = 0;
+       AUDIT_ARG(fd, uap->fd);
+       AUDIT_ARG(fflags, uap->flags);
+       if ( (error = file_vnode(uap->fd, &vp)) )
+               return (error);
 
-       if (uap->accessrequired) {
-               if (uap->accessrequired & R_OK)
-                       flags |= KAUTH_VNODE_READ_DATA;
-               if (uap->accessrequired & W_OK)
-                       flags |= KAUTH_VNODE_WRITE_DATA;
-               if (uap->accessrequired & X_OK)
-                       flags |= KAUTH_VNODE_EXECUTE;
-               }
-       error = vnode_authorize(vp, NULL, flags, &context);
-                       
-       vnode_put(vp);
+       if ((error = vnode_getwithref(vp))) {
+               file_drop(uap->fd);
+               return(error);
+       }
 
-       if (error) 
-               return (error);
-       
-       return (0); 
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
 
-} /* end of checkuseraccess system call */
+       /* we don't vnode_put() here because chflags1 does internally */
+       error = chflags1(vp, uap->flags, vfs_context_current());
 
-/************************************************/
-/* *** Preceding calls will be deleted soon *** */
-/************************************************/
+       file_drop(uap->fd);
+       return (error);
+}
 
-#endif /* __APPLE_API_OBSOLETE */
+/*
+ * Change security information on a filesystem object.
+ *
+ * Returns:    0                       Success
+ *             EPERM                   Operation not permitted
+ *             vnode_authattr:???      [anything vnode_authattr can return]
+ *             vnode_authorize:???     [anything vnode_authorize can return]
+ *             vnode_setattr:???       [anything vnode_setattr can return]
+ *
+ * Notes:      If vnode_authattr or vnode_authorize return EACCES, it will be
+ *             translated to EPERM before being returned.
+ */
+static int
+chmod_vnode(vfs_context_t ctx, vnode_t vp, struct vnode_attr *vap)
+{
+       kauth_action_t action;
+       int error;
 
+       AUDIT_ARG(mode, vap->va_mode);
+       /* XXX audit new args */
 
+#if NAMEDSTREAMS
+       /* chmod calls are not allowed for resource forks. */
+       if (vp->v_flag & VISNAMEDSTREAM) {
+               return (EPERM);
+       }
+#endif
 
-/* ARGSUSED */
+#if CONFIG_MACF
+       if (VATTR_IS_ACTIVE(vap, va_mode) &&
+           (error = mac_vnode_check_setmode(ctx, vp, (mode_t)vap->va_mode)) != 0)
+               return (error);
 
-int
-searchfs (struct proc *p, register struct searchfs_args *uap, __unused register_t *retval)
-{
-       register struct vnode *vp;
-       int error=0;
-       int fserror = 0;
-       struct nameidata nd;
-       struct user_fssearchblock searchblock;
-       struct searchstate *state;
-       struct attrlist *returnattrs;
-       void *searchparams1,*searchparams2;
-       uio_t auio = NULL;
-       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       u_long nummatches;
-       int mallocsize;
-       u_long nameiflags;
-       struct vfs_context context;
-       char uio_buf[ UIO_SIZEOF(1) ];
+       if (VATTR_IS_ACTIVE(vap, va_uid) || VATTR_IS_ACTIVE(vap, va_gid)) {
+               if ((error = mac_vnode_check_setowner(ctx, vp,
+                   VATTR_IS_ACTIVE(vap, va_uid) ? vap->va_uid : -1,
+                   VATTR_IS_ACTIVE(vap, va_gid) ? vap->va_gid : -1)))
+                       return (error);
+       }
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       if (VATTR_IS_ACTIVE(vap, va_acl) &&
+           (error = mac_vnode_check_setacl(ctx, vp, vap->va_acl)))
+               return (error);
+#endif
 
-       /* Start by copying in fsearchblock paramater list */
-    if (IS_64BIT_PROCESS(p)) {
-       error = copyin(uap->searchblock, (caddr_t) &searchblock, sizeof(searchblock));
-    }
-    else {
-        struct fssearchblock tmp_searchblock;
-        error = copyin(uap->searchblock, (caddr_t) &tmp_searchblock, sizeof(tmp_searchblock));
-        // munge into 64-bit version
-        searchblock.returnattrs = CAST_USER_ADDR_T(tmp_searchblock.returnattrs);
-        searchblock.returnbuffer = CAST_USER_ADDR_T(tmp_searchblock.returnbuffer);
-        searchblock.returnbuffersize = tmp_searchblock.returnbuffersize;
-        searchblock.maxmatches = tmp_searchblock.maxmatches;
-        searchblock.timelimit = tmp_searchblock.timelimit;
-        searchblock.searchparams1 = CAST_USER_ADDR_T(tmp_searchblock.searchparams1);
-        searchblock.sizeofsearchparams1 = tmp_searchblock.sizeofsearchparams1;
-        searchblock.searchparams2 = CAST_USER_ADDR_T(tmp_searchblock.searchparams2);
-        searchblock.sizeofsearchparams2 = tmp_searchblock.sizeofsearchparams2;
-        searchblock.searchattrs = tmp_searchblock.searchattrs;
-    }
-       if (error)
+       /* make sure that the caller is allowed to set this security information */
+       if (((error = vnode_authattr(vp, vap, &action, ctx)) != 0) ||
+           ((error = vnode_authorize(vp, NULL, action, ctx)) != 0)) {
+               if (error == EACCES)
+                       error = EPERM;
                return(error);
+       }
 
-       /* Do a sanity check on sizeofsearchparams1 and sizeofsearchparams2.  
-        */
-       if (searchblock.sizeofsearchparams1 > SEARCHFS_MAX_SEARCHPARMS || 
-               searchblock.sizeofsearchparams2 > SEARCHFS_MAX_SEARCHPARMS)
-               return(EINVAL);
-       
-       /* Now malloc a big bunch of space to hold the search parameters, the attrlists and the search state. */
-       /* It all has to do into local memory and it's not that big so we might as well  put it all together. */
-       /* Searchparams1 shall be first so we might as well use that to hold the base address of the allocated*/
-       /* block.                                                                                             */
-       
-       mallocsize = searchblock.sizeofsearchparams1 + searchblock.sizeofsearchparams2 +
-                     sizeof(struct attrlist) + sizeof(struct searchstate);
+       if ((error = vnode_setattr(vp, vap, ctx)) != 0)
+               return (error);
 
-       MALLOC(searchparams1, void *, mallocsize, M_TEMP, M_WAITOK);
+#if CONFIG_MACF
+       if (VATTR_IS_ACTIVE(vap, va_mode))
+               mac_vnode_notify_setmode(ctx, vp, (mode_t)vap->va_mode);
 
-       /* Now set up the various pointers to the correct place in our newly allocated memory */
+       if (VATTR_IS_ACTIVE(vap, va_uid) || VATTR_IS_ACTIVE(vap, va_gid))
+               mac_vnode_notify_setowner(ctx, vp,
+                       VATTR_IS_ACTIVE(vap, va_uid) ? vap->va_uid : -1,
+                       VATTR_IS_ACTIVE(vap, va_gid) ? vap->va_gid : -1);
 
-       searchparams2 = (void *) (((caddr_t) searchparams1) + searchblock.sizeofsearchparams1);
-       returnattrs = (struct attrlist *) (((caddr_t) searchparams2) + searchblock.sizeofsearchparams2);
-       state = (struct searchstate *) (((caddr_t) returnattrs) + sizeof (struct attrlist));
+       if (VATTR_IS_ACTIVE(vap, va_acl))
+               mac_vnode_notify_setacl(ctx, vp, vap->va_acl);
+#endif
 
-       /* Now copy in the stuff given our local variables. */
+       return (error);
+}
 
-       if ((error = copyin(searchblock.searchparams1, searchparams1, searchblock.sizeofsearchparams1)))
-               goto freeandexit;
 
-       if ((error = copyin(searchblock.searchparams2, searchparams2, searchblock.sizeofsearchparams2)))
-               goto freeandexit;
+/*
+ * Change mode of a file given a path name.
+ *
+ * Returns:    0                       Success
+ *             namei:???               [anything namei can return]
+ *             chmod_vnode:???         [anything chmod_vnode can return]
+ */
+static int
+chmodat(vfs_context_t ctx, user_addr_t path, struct vnode_attr *vap,
+    int fd, int flag, enum uio_seg segflg)
+{
+       struct nameidata nd;
+       int follow, error;
 
-       if ((error = copyin(searchblock.returnattrs, (caddr_t) returnattrs, sizeof(struct attrlist))))
-               goto freeandexit;
-               
-       if ((error = copyin(uap->state, (caddr_t) state, sizeof(struct searchstate))))
-               goto freeandexit;
-       
-       /* set up the uio structure which will contain the users return buffer */
+       follow = (flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_SETATTR, follow | AUDITVNPATH1,
+           segflg, path, ctx);
+       if ((error = nameiat(&nd, fd)))
+               return (error);
+       error = chmod_vnode(ctx, nd.ni_vp, vap);
+       vnode_put(nd.ni_vp);
+       nameidone(&nd);
+       return(error);
+}
 
-       auio = uio_createwithbuffer(1, 0, spacetype, UIO_READ, 
-                                                                 &uio_buf[0], sizeof(uio_buf));
-    uio_addiov(auio, searchblock.returnbuffer, searchblock.returnbuffersize);
+/*
+ * chmod_extended: Change the mode of a file given a path name; with extended
+ * argument list (including extended security (ACL)).
+ *
+ * Parameters: p                       Process requesting the open
+ *             uap                     User argument descriptor (see below)
+ *             retval                  (ignored)
+ *
+ * Indirect:   uap->path               Path to object (same as 'chmod')
+ *             uap->uid                UID to set
+ *             uap->gid                GID to set
+ *             uap->mode               File mode to set (same as 'chmod')
+ *             uap->xsecurity          ACL to set (or delete)
+ *
+ * Returns:    0                       Success
+ *             !0                      errno value
+ *
+ * Notes:      The kauth_filesec_t in 'va', if any, is in host byte order.
+ *
+ * XXX:                We should enummerate the possible errno values here, and where
+ *             in the code they originated.
+ */
+int
+chmod_extended(__unused proc_t p, struct chmod_extended_args *uap, __unused int32_t *retval)
+{
+       int error;
+       struct vnode_attr va;
+       kauth_filesec_t xsecdst;
 
-       nameiflags = 0;
-       if ((uap->options & FSOPT_NOFOLLOW) == 0) nameiflags |= FOLLOW;
-       NDINIT(&nd, LOOKUP, nameiflags | AUDITVNPATH1, 
-               UIO_USERSPACE, uap->path, &context);
+       AUDIT_ARG(owner, uap->uid, uap->gid);
 
-       error = namei(&nd);
-       if (error)
-               goto freeandexit;
+       VATTR_INIT(&va);
+       if (uap->mode != -1)
+               VATTR_SET(&va, va_mode, uap->mode & ALLPERMS);
+       if (uap->uid != KAUTH_UID_NONE)
+               VATTR_SET(&va, va_uid, uap->uid);
+       if (uap->gid != KAUTH_GID_NONE)
+               VATTR_SET(&va, va_gid, uap->gid);
 
-       nameidone(&nd);
-       vp = nd.ni_vp; 
+       xsecdst = NULL;
+       switch(uap->xsecurity) {
+               /* explicit remove request */
+       case CAST_USER_ADDR_T((void *)1):       /* _FILESEC_REMOVE_ACL */
+               VATTR_SET(&va, va_acl, NULL);
+               break;
+               /* not being set */
+       case USER_ADDR_NULL:
+               break;
+       default:
+               if ((error = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
+                       return(error);
+               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
+               KAUTH_DEBUG("CHMOD - setting ACL with %d entries", va.va_acl->acl_entrycount);
+       }
 
-        
-       /*
-        * If searchblock.maxmatches == 0, then skip the search. This has happened 
-        * before and sometimes the underlyning code doesnt deal with it well.
-        */
-        if (searchblock.maxmatches == 0) {
-               nummatches = 0;
-               goto saveandexit;
-        }
+       error = chmodat(vfs_context_current(), uap->path, &va, AT_FDCWD, 0,
+           UIO_USERSPACE);
 
-       /*
-          Allright, we have everything we need, so lets make that call.
-          
-          We keep special track of the return value from the file system:
-          EAGAIN is an acceptable error condition that shouldn't keep us
-          from copying out any results...
-        */
+       if (xsecdst != NULL)
+               kauth_filesec_free(xsecdst);
+       return(error);
+}
 
-       fserror = VNOP_SEARCHFS(vp,
-                                                       searchparams1,
-                                                       searchparams2,
-                                                       &searchblock.searchattrs,
-                                                       searchblock.maxmatches,
-                                                       &searchblock.timelimit,
-                                                       returnattrs,
-                                                       &nummatches,
-                                                       uap->scriptcode,
-                                                       uap->options,
-                                                       auio,
-                                                       state,
-                                                       &context);
-               
-saveandexit:
+/*
+ * Returns:    0                       Success
+ *             chmodat:???             [anything chmodat can return]
+ */
+static int
+fchmodat_internal(vfs_context_t ctx, user_addr_t path, int mode, int fd,
+    int flag, enum uio_seg segflg)
+{
+       struct vnode_attr va;
 
-       vnode_put(vp);
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_mode, mode & ALLPERMS);
 
-       /* Now copy out the stuff that needs copying out. That means the number of matches, the
-          search state.  Everything was already put into he return buffer by the vop call. */
+       return (chmodat(ctx, path, &va, fd, flag, segflg));
+}
 
-       if ((error = copyout((caddr_t) state, uap->state, sizeof(struct searchstate))) != 0)
-               goto freeandexit;
+int
+chmod(__unused proc_t p, struct chmod_args *uap, __unused int32_t *retval)
+{
+       return (fchmodat_internal(vfs_context_current(), uap->path, uap->mode,
+           AT_FDCWD, 0, UIO_USERSPACE));
+}
 
-    if ((error = suulong(uap->nummatches, (uint64_t)nummatches)) != 0)
-               goto freeandexit;
-       
-       error = fserror;
+int
+fchmodat(__unused proc_t p, struct fchmodat_args *uap, __unused int32_t *retval)
+{
+       if (uap->flag & ~AT_SYMLINK_NOFOLLOW)
+               return (EINVAL);
 
-freeandexit:
+       return (fchmodat_internal(vfs_context_current(), uap->path, uap->mode,
+           uap->fd, uap->flag, UIO_USERSPACE));
+}
 
-       FREE(searchparams1,M_TEMP);
+/*
+ * Change mode of a file given a file descriptor.
+ */
+static int
+fchmod1(__unused proc_t p, int fd, struct vnode_attr *vap)
+{
+       vnode_t vp;
+       int error;
 
-       return(error);
+       AUDIT_ARG(fd, fd);
 
+       if ((error = file_vnode(fd, &vp)) != 0)
+               return (error);
+       if ((error = vnode_getwithref(vp)) != 0) {
+               file_drop(fd);
+               return(error);
+       }
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
 
-} /* end of searchfs system call */
+       error = chmod_vnode(vfs_context_current(), vp, vap);
+       (void)vnode_put(vp);
+       file_drop(fd);
 
+       return (error);
+}
 
 /*
- * Make a filesystem-specific control call:
+ * fchmod_extended: Change mode of a file given a file descriptor; with
+ * extended argument list (including extended security (ACL)).
+ *
+ * Parameters:    p                       Process requesting to change file mode
+ *                uap                     User argument descriptor (see below)
+ *                retval                  (ignored)
+ *
+ * Indirect:      uap->mode               File mode to set (same as 'chmod')
+ *                uap->uid                UID to set
+ *                uap->gid                GID to set
+ *                uap->xsecurity          ACL to set (or delete)
+ *                uap->fd                 File descriptor of file to change mode
+ *
+ * Returns:        0                      Success
+ *                !0                      errno value
+ *
  */
-/* ARGSUSED */
 int
-fsctl (struct proc *p, struct fsctl_args *uap, __unused register_t *retval)
+fchmod_extended(proc_t p, struct fchmod_extended_args *uap, __unused int32_t *retval)
 {
        int error;
-       boolean_t is64bit;
-       struct nameidata nd;    
-       u_long nameiflags;
-       u_long cmd = uap->cmd;
-       register u_int size;
-#define STK_PARAMS 128
-       char stkbuf[STK_PARAMS];
-       caddr_t data, memp;
-       struct vfs_context context;
+       struct vnode_attr va;
+       kauth_filesec_t xsecdst;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       AUDIT_ARG(owner, uap->uid, uap->gid);
 
-       size = IOCPARM_LEN(cmd);
-       if (size > IOCPARM_MAX) return (EINVAL);
+       VATTR_INIT(&va);
+       if (uap->mode != -1)
+               VATTR_SET(&va, va_mode, uap->mode & ALLPERMS);
+       if (uap->uid != KAUTH_UID_NONE)
+               VATTR_SET(&va, va_uid, uap->uid);
+       if (uap->gid != KAUTH_GID_NONE)
+               VATTR_SET(&va, va_gid, uap->gid);
 
-    is64bit = proc_is64bit(p);
+       xsecdst = NULL;
+       switch(uap->xsecurity) {
+       case USER_ADDR_NULL:
+               VATTR_SET(&va, va_acl, NULL);
+               break;
+       case CAST_USER_ADDR_T((void *)1):       /* _FILESEC_REMOVE_ACL */
+               VATTR_SET(&va, va_acl, NULL);
+               break;
+               /* not being set */
+       case CAST_USER_ADDR_T(-1):
+               break;
+       default:
+               if ((error = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
+                       return(error);
+               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
+       }
 
-       memp = NULL;
-       if (size > sizeof (stkbuf)) {
-               if ((memp = (caddr_t)kalloc(size)) == 0) return ENOMEM;
-               data = memp;
+       error = fchmod1(p, uap->fd, &va);
+
+
+       switch(uap->xsecurity) {
+       case USER_ADDR_NULL:
+       case CAST_USER_ADDR_T(-1):
+               break;
+       default:
+               if (xsecdst != NULL)
+                       kauth_filesec_free(xsecdst);
+       }
+       return(error);
+}
+
+int
+fchmod(proc_t p, struct fchmod_args *uap, __unused int32_t *retval)
+{
+       struct vnode_attr va;
+
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_mode, uap->mode & ALLPERMS);
+
+       return(fchmod1(p, uap->fd, &va));
+}
+
+
+/*
+ * Set ownership given a path name.
+ */
+/* ARGSUSED */
+static int
+fchownat_internal(vfs_context_t ctx, int fd, user_addr_t path, uid_t uid,
+   gid_t gid, int flag, enum uio_seg segflg)
+{
+       vnode_t vp;
+       struct vnode_attr va;
+       int error;
+       struct nameidata nd;
+       int follow;
+       kauth_action_t action;
+
+       AUDIT_ARG(owner, uid, gid);
+
+       follow = (flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_SETATTR, follow | AUDITVNPATH1, segflg,
+           path, ctx);
+       error = nameiat(&nd, fd);
+       if (error)
+               return (error);
+       vp = nd.ni_vp;
+
+       nameidone(&nd);
+
+       VATTR_INIT(&va);
+       if (uid != (uid_t)VNOVAL)
+               VATTR_SET(&va, va_uid, uid);
+       if (gid != (gid_t)VNOVAL)
+               VATTR_SET(&va, va_gid, gid);
+
+#if CONFIG_MACF
+       error = mac_vnode_check_setowner(ctx, vp, uid, gid);
+       if (error)
+               goto out;
+#endif
+
+       /* preflight and authorize attribute changes */
+       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0)
+               goto out;
+       if (action && ((error = vnode_authorize(vp, NULL, action, ctx)) != 0))
+               goto out;
+       error = vnode_setattr(vp, &va, ctx);
+
+#if CONFIG_MACF
+       if (error == 0)
+               mac_vnode_notify_setowner(ctx, vp, uid, gid);
+#endif
+
+out:
+       /*
+        * EACCES is only allowed from namei(); permissions failure should
+        * return EPERM, so we need to translate the error code.
+        */
+       if (error == EACCES)
+               error = EPERM;
+
+       vnode_put(vp);
+       return (error);
+}
+
+int
+chown(__unused proc_t p, struct chown_args *uap, __unused int32_t *retval)
+{
+       return (fchownat_internal(vfs_context_current(), AT_FDCWD, uap->path,
+           uap->uid, uap->gid, 0, UIO_USERSPACE));
+}
+
+int
+lchown(__unused proc_t p, struct lchown_args *uap, __unused int32_t *retval)
+{
+       return (fchownat_internal(vfs_context_current(), AT_FDCWD, uap->path,
+           uap->owner, uap->group, AT_SYMLINK_NOFOLLOW, UIO_USERSPACE));
+}
+
+int
+fchownat(__unused proc_t p, struct fchownat_args *uap, __unused int32_t *retval)
+{
+       if (uap->flag & ~AT_SYMLINK_NOFOLLOW)
+               return (EINVAL);
+
+       return (fchownat_internal(vfs_context_current(), uap->fd, uap->path,
+           uap->uid, uap->gid, uap->flag, UIO_USERSPACE));
+}
+
+/*
+ * Set ownership given a file descriptor.
+ */
+/* ARGSUSED */
+int
+fchown(__unused proc_t p, struct fchown_args *uap, __unused int32_t *retval)
+{
+       struct vnode_attr va;
+       vfs_context_t ctx = vfs_context_current();
+       vnode_t vp;
+       int error;
+       kauth_action_t action;
+
+       AUDIT_ARG(owner, uap->uid, uap->gid);
+       AUDIT_ARG(fd, uap->fd);
+
+       if ( (error = file_vnode(uap->fd, &vp)) )
+               return (error);
+
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
+       }
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+
+       VATTR_INIT(&va);
+       if (uap->uid != VNOVAL)
+               VATTR_SET(&va, va_uid, uap->uid);
+       if (uap->gid != VNOVAL)
+               VATTR_SET(&va, va_gid, uap->gid);
+
+#if NAMEDSTREAMS
+       /* chown calls are not allowed for resource forks. */
+       if (vp->v_flag & VISNAMEDSTREAM) {
+               error = EPERM;
+               goto out;
+       }
+#endif
+
+#if CONFIG_MACF
+       error = mac_vnode_check_setowner(ctx, vp, uap->uid, uap->gid);
+       if (error)
+               goto out;
+#endif
+
+       /* preflight and authorize attribute changes */
+       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0)
+               goto out;
+       if (action && ((error = vnode_authorize(vp, NULL, action, ctx)) != 0)) {
+               if (error == EACCES)
+                       error = EPERM;
+               goto out;
+       }
+       error = vnode_setattr(vp, &va, ctx);
+
+#if CONFIG_MACF
+       if (error == 0)
+               mac_vnode_notify_setowner(ctx, vp, uap->uid, uap->gid);
+#endif
+
+out:
+       (void)vnode_put(vp);
+       file_drop(uap->fd);
+       return (error);
+}
+
+static int
+getutimes(user_addr_t usrtvp, struct timespec *tsp)
+{
+       int error;
+
+       if (usrtvp == USER_ADDR_NULL) {
+               struct timeval old_tv;
+               /* XXX Y2038 bug because of microtime argument */
+               microtime(&old_tv);
+               TIMEVAL_TO_TIMESPEC(&old_tv, &tsp[0]);
+               tsp[1] = tsp[0];
        } else {
-               data = &stkbuf[0];
-       };
-       
-       if (cmd & IOC_IN) {
-               if (size) {
-                       error = copyin(uap->data, data, size);
-                       if (error) goto FSCtl_Exit;
+               if (IS_64BIT_PROCESS(current_proc())) {
+                       struct user64_timeval tv[2];
+                       error = copyin(usrtvp, (void *)tv, sizeof(tv));
+                       if (error)
+                               return (error);
+                       TIMEVAL_TO_TIMESPEC(&tv[0], &tsp[0]);
+                       TIMEVAL_TO_TIMESPEC(&tv[1], &tsp[1]);
                } else {
-                   if (is64bit) {
-                       *(user_addr_t *)data = uap->data;
-                   }
-                   else {
-                       *(uint32_t *)data = (uint32_t)uap->data;
-                   }
-               };
-       } else if ((cmd & IOC_OUT) && size) {
-               /*
-                * Zero the buffer so the user always
-                * gets back something deterministic.
-                */
-               bzero(data, size);
-       } else if (cmd & IOC_VOID) {
-        if (is64bit) {
-            *(user_addr_t *)data = uap->data;
-        }
-        else {
-            *(uint32_t *)data = (uint32_t)uap->data;
-        }
+                       struct user32_timeval tv[2];
+                       error = copyin(usrtvp, (void *)tv, sizeof(tv));
+                       if (error)
+                               return (error);
+                       TIMEVAL_TO_TIMESPEC(&tv[0], &tsp[0]);
+                       TIMEVAL_TO_TIMESPEC(&tv[1], &tsp[1]);
+               }
        }
+       return 0;
+}
 
-       /* Get the vnode for the file we are getting info on:  */
-       nameiflags = 0;
-       if ((uap->options & FSOPT_NOFOLLOW) == 0) nameiflags |= FOLLOW;
-       NDINIT(&nd, LOOKUP, nameiflags, UIO_USERSPACE, uap->path, &context);
-       if ((error = namei(&nd))) goto FSCtl_Exit;
+static int
+setutimes(vfs_context_t ctx, vnode_t vp, const struct timespec *ts,
+       int nullflag)
+{
+       int error;
+       struct vnode_attr va;
+       kauth_action_t action;
 
-       /* Invoke the filesystem-specific code */
-       error = VNOP_IOCTL(nd.ni_vp, IOCBASECMD(cmd), data, uap->options, &context);
-       
-       vnode_put(nd.ni_vp);
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_access_time, ts[0]);
+       VATTR_SET(&va, va_modify_time, ts[1]);
+       if (nullflag)
+               va.va_vaflags |= VA_UTIMES_NULL;
+
+#if NAMEDSTREAMS
+       /* utimes calls are not allowed for resource forks. */
+       if (vp->v_flag & VISNAMEDSTREAM) {
+               error = EPERM;
+               goto out;
+       }
+#endif
+
+#if CONFIG_MACF
+       error = mac_vnode_check_setutimes(ctx, vp, ts[0], ts[1]);
+       if (error)
+               goto out;
+#endif
+       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0) {
+               if (!nullflag && error == EACCES)
+                       error = EPERM;
+               goto out;
+       }
+
+       /* since we may not need to auth anything, check here */
+       if ((action != 0) && ((error = vnode_authorize(vp, NULL, action, ctx)) != 0)) {
+               if (!nullflag && error == EACCES)
+                       error = EPERM;
+               goto out;
+       }
+       error = vnode_setattr(vp, &va, ctx);
+
+#if CONFIG_MACF
+       if (error == 0)
+               mac_vnode_notify_setutimes(ctx, vp, ts[0], ts[1]);
+#endif
+
+out:
+       return error;
+}
+
+/*
+ * Set the access and modification times of a file.
+ */
+/* ARGSUSED */
+int
+utimes(__unused proc_t p, struct utimes_args *uap, __unused int32_t *retval)
+{
+       struct timespec ts[2];
+       user_addr_t usrtvp;
+       int error;
+       struct nameidata nd;
+       vfs_context_t ctx = vfs_context_current();
+
+       /*
+        * AUDIT: Needed to change the order of operations to do the
+        * name lookup first because auditing wants the path.
+        */
+       NDINIT(&nd, LOOKUP, OP_SETATTR, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       error = namei(&nd);
+       if (error)
+               return (error);
        nameidone(&nd);
-       
+
        /*
-        * Copy any data to user, size was
-        * already set and checked above.
+        * Fetch the user-supplied time.  If usrtvp is USER_ADDR_NULL, we fetch
+        * the current time instead.
         */
-       if (error == 0 && (cmd & IOC_OUT) && size) 
-               error = copyout(data, uap->data, size);
-       
-FSCtl_Exit:
-       if (memp) kfree(memp, size);
-       
-       return error;
+       usrtvp = uap->tptr;
+       if ((error = getutimes(usrtvp, ts)) != 0)
+               goto out;
+
+       error = setutimes(ctx, nd.ni_vp, ts, usrtvp == USER_ADDR_NULL);
+
+out:
+       vnode_put(nd.ni_vp);
+       return (error);
+}
+
+/*
+ * Set the access and modification times of a file.
+ */
+/* ARGSUSED */
+int
+futimes(__unused proc_t p, struct futimes_args *uap, __unused int32_t *retval)
+{
+       struct timespec ts[2];
+       vnode_t vp;
+       user_addr_t usrtvp;
+       int error;
+
+       AUDIT_ARG(fd, uap->fd);
+       usrtvp = uap->tptr;
+       if ((error = getutimes(usrtvp, ts)) != 0)
+               return (error);
+       if ((error = file_vnode(uap->fd, &vp)) != 0)
+               return (error);
+       if((error = vnode_getwithref(vp))) {
+               file_drop(uap->fd);
+               return(error);
+       }
+
+       error =  setutimes(vfs_context_current(), vp, ts, usrtvp == 0);
+       vnode_put(vp);
+       file_drop(uap->fd);
+       return(error);
+}
+
+/*
+ * Truncate a file given its path name.
+ */
+/* ARGSUSED */
+int
+truncate(__unused proc_t p, struct truncate_args *uap, __unused int32_t *retval)
+{
+       vnode_t vp;
+       struct vnode_attr va;
+       vfs_context_t ctx = vfs_context_current();
+       int error;
+       struct nameidata nd;
+       kauth_action_t action;
+
+       if (uap->length < 0)
+               return(EINVAL);
+       NDINIT(&nd, LOOKUP, OP_TRUNCATE, FOLLOW | AUDITVNPATH1,
+               UIO_USERSPACE, uap->path, ctx);
+       if ((error = namei(&nd)))
+               return (error);
+       vp = nd.ni_vp;
+
+       nameidone(&nd);
+
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_data_size, uap->length);
+
+#if CONFIG_MACF
+       error = mac_vnode_check_truncate(ctx, NOCRED, vp);
+       if (error)
+               goto out;
+#endif
+
+       if ((error = vnode_authattr(vp, &va, &action, ctx)) != 0)
+               goto out;
+       if ((action != 0) && ((error = vnode_authorize(vp, NULL, action, ctx)) != 0))
+               goto out;
+       error = vnode_setattr(vp, &va, ctx);
+
+#if CONFIG_MACF
+       if (error == 0)
+               mac_vnode_notify_truncate(ctx, NOCRED, vp);
+#endif
+
+out:
+       vnode_put(vp);
+       return (error);
+}
+
+/*
+ * Truncate a file given a file descriptor.
+ */
+/* ARGSUSED */
+int
+ftruncate(proc_t p, struct ftruncate_args *uap, int32_t *retval)
+{
+       vfs_context_t ctx = vfs_context_current();
+       struct vnode_attr va;
+       vnode_t vp;
+       struct fileproc *fp;
+       int error ;
+       int fd = uap->fd;
+
+       AUDIT_ARG(fd, uap->fd);
+       if (uap->length < 0)
+               return(EINVAL);
+
+       if ( (error = fp_lookup(p,fd,&fp,0)) ) {
+               return(error);
+       }
+
+       switch (FILEGLOB_DTYPE(fp->f_fglob)) {
+       case DTYPE_PSXSHM:
+               error = pshm_truncate(p, fp, uap->fd, uap->length, retval);
+               goto out;
+       case DTYPE_VNODE:
+               break;
+       default:
+               error = EINVAL;
+               goto out;
+       }
+
+       vp = (vnode_t)fp->f_fglob->fg_data;
+
+       if ((fp->f_fglob->fg_flag & FWRITE) == 0) {
+               AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
+               error = EINVAL;
+               goto out;
+       }
+
+       if ((error = vnode_getwithref(vp)) != 0) {
+               goto out;
+       }
+
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+
+#if CONFIG_MACF
+       error = mac_vnode_check_truncate(ctx,
+           fp->f_fglob->fg_cred, vp);
+       if (error) {
+               (void)vnode_put(vp);
+               goto out;
+       }
+#endif
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_data_size, uap->length);
+       error = vnode_setattr(vp, &va, ctx);
+
+#if CONFIG_MACF
+       if (error == 0)
+               mac_vnode_notify_truncate(ctx, fp->f_fglob->fg_cred, vp);
+#endif
+
+       (void)vnode_put(vp);
+out:
+       file_drop(fd);
+       return (error);
+}
+
+
+/*
+ * Sync an open file with synchronized I/O _file_ integrity completion
+ */
+/* ARGSUSED */
+int
+fsync(proc_t p, struct fsync_args *uap, __unused int32_t *retval)
+{
+       __pthread_testcancel(1);
+       return(fsync_common(p, uap, MNT_WAIT));
+}
+
+
+/*
+ * Sync an open file with synchronized I/O _file_ integrity completion
+ *
+ * Notes:      This is a legacy support function that does not test for
+ *             thread cancellation points.
+ */
+/* ARGSUSED */
+int
+fsync_nocancel(proc_t p, struct fsync_nocancel_args *uap, __unused int32_t *retval)
+{
+       return(fsync_common(p, (struct fsync_args *)uap, MNT_WAIT));
+}
+
+
+/*
+ * Sync an open file with synchronized I/O _data_ integrity completion
+ */
+/* ARGSUSED */
+int
+fdatasync(proc_t p, struct fdatasync_args *uap, __unused int32_t *retval)
+{
+       __pthread_testcancel(1);
+       return(fsync_common(p, (struct fsync_args *)uap, MNT_DWAIT));
+}
+
+
+/*
+ * fsync_common
+ *
+ * Common fsync code to support both synchronized I/O file integrity completion
+ * (normal fsync) and synchronized I/O data integrity completion (fdatasync).
+ *
+ * If 'flags' is MNT_DWAIT, the caller is requesting data integrity, which
+ * will only guarantee that the file data contents are retrievable.  If
+ * 'flags' is MNT_WAIT, the caller is rewuesting file integrity, which also
+ * includes additional metadata unnecessary for retrieving the file data
+ * contents, such as atime, mtime, ctime, etc., also be committed to stable
+ * storage.
+ *
+ * Parameters: p                               The process
+ *             uap->fd                         The descriptor to synchronize
+ *             flags                           The data integrity flags
+ *
+ * Returns:    int                             Success
+ *     fp_getfvp:EBADF                         Bad file descriptor
+ *     fp_getfvp:ENOTSUP                       fd does not refer to a vnode
+ *     VNOP_FSYNC:???                          unspecified
+ *
+ * Notes:      We use struct fsync_args because it is a short name, and all
+ *             caller argument structures are otherwise identical.
+ */
+static int
+fsync_common(proc_t p, struct fsync_args *uap, int flags)
+{
+       vnode_t vp;
+       struct fileproc *fp;
+       vfs_context_t ctx = vfs_context_current();
+       int error;
+
+       AUDIT_ARG(fd, uap->fd);
+
+       if ( (error = fp_getfvp(p, uap->fd, &fp, &vp)) )
+               return (error);
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
+       }
+
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+
+       error = VNOP_FSYNC(vp, flags, ctx);
+
+#if NAMEDRSRCFORK
+       /* Sync resource fork shadow file if necessary. */
+       if ((error == 0) &&
+           (vp->v_flag & VISNAMEDSTREAM) &&
+           (vp->v_parent != NULLVP) &&
+           vnode_isshadow(vp) &&
+           (fp->f_flags & FP_WRITTEN)) {
+               (void) vnode_flushnamedstream(vp->v_parent, vp, ctx);
+       }
+#endif
+
+       (void)vnode_put(vp);
+       file_drop(uap->fd);
+       return (error);
+}
+
+/*
+ * Duplicate files.  Source must be a file, target must be a file or
+ * must not exist.
+ *
+ * XXX Copyfile authorisation checking is woefully inadequate, and will not
+ *     perform inheritance correctly.
+ */
+/* ARGSUSED */
+int
+copyfile(__unused proc_t p, struct copyfile_args *uap, __unused int32_t *retval)
+{
+       vnode_t tvp, fvp, tdvp, sdvp;
+       struct nameidata fromnd, tond;
+       int error;
+       vfs_context_t ctx = vfs_context_current();
+#if CONFIG_MACF
+       struct filedesc *fdp = (vfs_context_proc(ctx))->p_fd;
+       struct vnode_attr va;
+#endif
+
+       /* Check that the flags are valid. */
+
+       if (uap->flags & ~CPF_MASK) {
+               return(EINVAL);
+       }
+
+       NDINIT(&fromnd, LOOKUP, OP_COPYFILE, AUDITVNPATH1,
+               UIO_USERSPACE, uap->from, ctx);
+       if ((error = namei(&fromnd)))
+               return (error);
+       fvp = fromnd.ni_vp;
+
+       NDINIT(&tond, CREATE, OP_LINK,
+              LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | AUDITVNPATH2 | CN_NBMOUNTLOOK,
+              UIO_USERSPACE, uap->to, ctx);
+       if ((error = namei(&tond))) {
+               goto out1;
+       }
+       tdvp = tond.ni_dvp;
+       tvp = tond.ni_vp;
+
+       if (tvp != NULL) {
+               if (!(uap->flags & CPF_OVERWRITE)) {
+                       error = EEXIST;
+                       goto out;
+               }
+       }
+
+       if (fvp->v_type == VDIR || (tvp && tvp->v_type == VDIR)) {
+               error = EISDIR;
+               goto out;
+       }
+
+       /* This calls existing MAC hooks for open  */
+       if ((error = vn_authorize_open_existing(fvp, &fromnd.ni_cnd, FREAD, ctx,
+           NULL))) {
+               goto out;
+       }
+
+       if (tvp) {
+               /*
+                * See unlinkat_internal for an explanation of the potential
+                * ENOENT from the MAC hook but the gist is that the MAC hook
+                * can fail because vn_getpath isn't able to return the full
+                * path. We choose to ignore this failure.
+                */
+               error = vn_authorize_unlink(tdvp, tvp, &tond.ni_cnd, ctx, NULL);
+               if (error && error != ENOENT)
+                       goto out;
+               error = 0;
+       }
+
+#if CONFIG_MACF
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_type, fvp->v_type);
+       /* Mask off all but regular access permissions */
+       VATTR_SET(&va, va_mode,
+           ((((uap->mode &~ fdp->fd_cmask) & ALLPERMS) & ~S_ISTXT) & ACCESSPERMS));
+       error = mac_vnode_check_create(ctx, tdvp, &tond.ni_cnd, &va);
+       if (error)
+               goto out;
+#endif /* CONFIG_MACF */
+
+       if ((error = vnode_authorize(tdvp, NULL, KAUTH_VNODE_ADD_FILE, ctx)) != 0)
+               goto out;
+
+       if (fvp == tdvp)
+               error = EINVAL;
+       /*
+        * If source is the same as the destination (that is the
+        * same inode number) then there is nothing to do.
+        * (fixed to have POSIX semantics - CSM 3/2/98)
+        */
+       if (fvp == tvp)
+               error = -1;
+       if (!error)
+               error = VNOP_COPYFILE(fvp, tdvp, tvp, &tond.ni_cnd, uap->mode, uap->flags, ctx);
+out:
+       sdvp = tond.ni_startdir;
+       /*
+        * nameidone has to happen before we vnode_put(tdvp)
+        * since it may need to release the fs_nodelock on the tdvp
+        */
+       nameidone(&tond);
+
+       if (tvp)
+               vnode_put(tvp);
+       vnode_put(tdvp);
+       vnode_put(sdvp);
+out1:
+       vnode_put(fvp);
+
+       nameidone(&fromnd);
+
+       if (error == -1)
+               return (0);
+       return (error);
+}
+
+#define CLONE_SNAPSHOT_FALLBACKS_ENABLED 1
+
+/*
+ * Helper function for doing clones. The caller is expected to provide an
+ * iocounted source vnode and release it.
+ */
+static int
+clonefile_internal(vnode_t fvp, boolean_t data_read_authorised, int dst_dirfd,
+    user_addr_t dst, uint32_t flags, vfs_context_t ctx)
+{
+       vnode_t tvp, tdvp;
+       struct nameidata tond;
+       int error;
+       int follow;
+       boolean_t free_src_acl;
+       boolean_t attr_cleanup;
+       enum vtype v_type;
+       kauth_action_t action;
+       struct componentname *cnp;
+       uint32_t defaulted;
+       struct vnode_attr va;
+       struct vnode_attr nva;
+       uint32_t vnop_flags;
+
+       v_type = vnode_vtype(fvp);
+       switch (v_type) {
+       case VLNK:
+               /* FALLTHRU */
+       case VREG:
+               action = KAUTH_VNODE_ADD_FILE;
+               break;
+       case VDIR:
+               if (vnode_isvroot(fvp) || vnode_ismount(fvp) ||
+                   fvp->v_mountedhere) {
+                       return (EINVAL);
+               }
+               action = KAUTH_VNODE_ADD_SUBDIRECTORY;
+               break;
+       default:
+               return (EINVAL);
+       }
+
+       AUDIT_ARG(fd2, dst_dirfd);
+       AUDIT_ARG(value32, flags);
+
+       follow = (flags & CLONE_NOFOLLOW) ? NOFOLLOW : FOLLOW;
+       NDINIT(&tond, CREATE, OP_LINK, follow | WANTPARENT | AUDITVNPATH2,
+           UIO_USERSPACE, dst, ctx);
+       if ((error = nameiat(&tond, dst_dirfd)))
+               return (error);
+       cnp = &tond.ni_cnd;
+       tdvp = tond.ni_dvp;
+       tvp = tond.ni_vp;
+
+       free_src_acl = FALSE;
+       attr_cleanup = FALSE;
+
+       if (tvp != NULL) {
+               error = EEXIST;
+               goto out;
+       }
+
+       if (vnode_mount(tdvp) != vnode_mount(fvp)) {
+               error = EXDEV;
+               goto out;
+       }
+
+#if CONFIG_MACF
+       if ((error = mac_vnode_check_clone(ctx, tdvp, fvp, cnp)))
+               goto out;
+#endif
+       if ((error = vnode_authorize(tdvp, NULL, action, ctx)))
+               goto out;
+
+       action = KAUTH_VNODE_GENERIC_READ_BITS;
+       if (data_read_authorised)
+               action &= ~KAUTH_VNODE_READ_DATA;
+       if ((error = vnode_authorize(fvp, NULL, action, ctx)))
+               goto out;
+
+       /*
+        * certain attributes may need to be changed from the source, we ask for
+        * those here.
+        */
+       VATTR_INIT(&va);
+       VATTR_WANTED(&va, va_uid);
+       VATTR_WANTED(&va, va_gid);
+       VATTR_WANTED(&va, va_mode);
+       VATTR_WANTED(&va, va_flags);
+       VATTR_WANTED(&va, va_acl);
+
+       if ((error = vnode_getattr(fvp, &va, ctx)) != 0)
+               goto out;
+
+       VATTR_INIT(&nva);
+       VATTR_SET(&nva, va_type, v_type);
+       if (VATTR_IS_SUPPORTED(&va, va_acl) && va.va_acl != NULL) {
+               VATTR_SET(&nva, va_acl, va.va_acl);
+               free_src_acl = TRUE;
+       }
+
+       /* Handle ACL inheritance, initialize vap. */
+       if (v_type == VLNK) {
+               error = vnode_authattr_new(tdvp, &nva, 0, ctx);
+       } else {
+               error = vn_attribute_prepare(tdvp, &nva, &defaulted, ctx);
+               if (error)
+                       goto out;
+               attr_cleanup = TRUE;
+       }
+
+       vnop_flags = VNODE_CLONEFILE_DEFAULT;
+       /*
+        * We've got initial values for all security parameters,
+        * If we are superuser, then we can change owners to be the
+        * same as the source. Both superuser and the owner have default
+        * WRITE_SECURITY privileges so all other fields can be taken
+        * from source as well.
+        */
+       if (!(flags & CLONE_NOOWNERCOPY) && vfs_context_issuser(ctx)) {
+               if (VATTR_IS_SUPPORTED(&va, va_uid))
+                       VATTR_SET(&nva, va_uid, va.va_uid);
+               if (VATTR_IS_SUPPORTED(&va, va_gid))
+                       VATTR_SET(&nva, va_gid, va.va_gid);
+       } else {
+               vnop_flags |= VNODE_CLONEFILE_NOOWNERCOPY;
+       }
+
+       if (VATTR_IS_SUPPORTED(&va, va_mode))
+               VATTR_SET(&nva, va_mode, va.va_mode);
+       if (VATTR_IS_SUPPORTED(&va, va_flags)) {
+               VATTR_SET(&nva, va_flags,
+                   ((va.va_flags & ~(UF_DATAVAULT | SF_RESTRICTED)) | /* Turn off from source */
+                   (nva.va_flags & (UF_DATAVAULT | SF_RESTRICTED))));
+       }
+
+       error = VNOP_CLONEFILE(fvp, tdvp, &tvp, cnp, &nva, vnop_flags, ctx);
+
+       if (!error && tvp) {
+               int     update_flags = 0;
+#if CONFIG_FSE
+               int fsevent;
+#endif /* CONFIG_FSE */
+
+#if CONFIG_MACF
+               (void)vnode_label(vnode_mount(tvp), tdvp, tvp, cnp,
+                   VNODE_LABEL_CREATE, ctx);
+#endif
+               /*
+                * If some of the requested attributes weren't handled by the
+                * VNOP, use our fallback code.
+                */
+               if (!VATTR_ALL_SUPPORTED(&va))
+                       (void)vnode_setattr_fallback(tvp, &nva, ctx);
+
+               // Make sure the name & parent pointers are hooked up
+               if (tvp->v_name == NULL)
+                       update_flags |= VNODE_UPDATE_NAME;
+               if (tvp->v_parent == NULLVP)
+                       update_flags |= VNODE_UPDATE_PARENT;
+
+               if (update_flags) {
+                       (void)vnode_update_identity(tvp, tdvp, cnp->cn_nameptr,
+                           cnp->cn_namelen, cnp->cn_hash, update_flags);
+               }
+
+#if CONFIG_FSE
+               switch (vnode_vtype(tvp)) {
+               case VLNK:
+                       /* FALLTHRU */
+               case VREG:
+                       fsevent = FSE_CREATE_FILE;
+                       break;
+               case VDIR:
+                       fsevent = FSE_CREATE_DIR;
+                       break;
+               default:
+                       goto out;
+               }
+
+               if (need_fsevent(fsevent, tvp)) {
+                       /*
+                        * The following is a sequence of three explicit events.
+                        * A pair of FSE_CLONE events representing the source and destination
+                        * followed by an FSE_CREATE_[FILE | DIR] for the destination.
+                        * fseventsd may coalesce the destination clone and create events
+                        * into a single event resulting in the following sequence for a client
+                        * FSE_CLONE (src)
+                        * FSE_CLONE | FSE_CREATE (dst)
+                        */
+                       add_fsevent(FSE_CLONE, ctx, FSE_ARG_VNODE, fvp, FSE_ARG_VNODE, tvp,
+                           FSE_ARG_DONE);
+                       add_fsevent(fsevent, ctx, FSE_ARG_VNODE, tvp,
+                           FSE_ARG_DONE);
+               }
+#endif /* CONFIG_FSE */
+       }
+
+out:
+       if (attr_cleanup)
+               vn_attribute_cleanup(&nva, defaulted);
+       if (free_src_acl && va.va_acl)
+               kauth_acl_free(va.va_acl);
+       nameidone(&tond);
+       if (tvp)
+               vnode_put(tvp);
+       vnode_put(tdvp);
+       return (error);
+}
+
+/*
+ * clone files or directories, target must not exist.
+ */
+/* ARGSUSED */
+int
+clonefileat(__unused proc_t p, struct clonefileat_args *uap,
+    __unused int32_t *retval)
+{
+       vnode_t fvp;
+       struct nameidata fromnd;
+       int follow;
+       int error;
+       vfs_context_t ctx = vfs_context_current();
+
+       /* Check that the flags are valid. */
+       if (uap->flags & ~(CLONE_NOFOLLOW | CLONE_NOOWNERCOPY))
+               return (EINVAL);
+
+       AUDIT_ARG(fd, uap->src_dirfd);
+
+       follow = (uap->flags & CLONE_NOFOLLOW) ? NOFOLLOW : FOLLOW;
+       NDINIT(&fromnd, LOOKUP, OP_COPYFILE, follow | AUDITVNPATH1,
+           UIO_USERSPACE, uap->src, ctx);
+       if ((error = nameiat(&fromnd, uap->src_dirfd)))
+               return (error);
+
+       fvp = fromnd.ni_vp;
+       nameidone(&fromnd);
+
+       error = clonefile_internal(fvp, FALSE, uap->dst_dirfd, uap->dst,
+           uap->flags, ctx);
+
+       vnode_put(fvp);
+       return (error);
+}
+
+int
+fclonefileat(__unused proc_t p, struct fclonefileat_args *uap,
+    __unused int32_t *retval)
+{
+       vnode_t fvp;
+       struct fileproc *fp;
+       int error;
+       vfs_context_t ctx = vfs_context_current();
+
+       /* Check that the flags are valid. */
+       if (uap->flags & ~(CLONE_NOFOLLOW | CLONE_NOOWNERCOPY))
+               return (EINVAL);
+
+       AUDIT_ARG(fd, uap->src_fd);
+       error = fp_getfvp(p, uap->src_fd, &fp, &fvp);
+       if (error)
+               return (error);
+
+       if ((fp->f_fglob->fg_flag & FREAD) == 0) {
+               AUDIT_ARG(vnpath_withref, fvp, ARG_VNODE1);
+               error = EBADF;
+               goto out;
+       }
+
+       if ((error = vnode_getwithref(fvp)))
+               goto out;
+
+       AUDIT_ARG(vnpath, fvp, ARG_VNODE1);
+
+       error = clonefile_internal(fvp, TRUE, uap->dst_dirfd, uap->dst,
+           uap->flags, ctx);
+
+       vnode_put(fvp);
+out:
+       file_drop(uap->src_fd);
+       return (error);
+}
+
+/*
+ * Rename files.  Source and destination must either both be directories,
+ * or both not be directories.  If target is a directory, it must be empty.
+ */
+/* ARGSUSED */
+static int
+renameat_internal(vfs_context_t ctx, int fromfd, user_addr_t from,
+    int tofd, user_addr_t to, int segflg, vfs_rename_flags_t flags)
+{
+       if (flags & ~VFS_RENAME_FLAGS_MASK)
+               return EINVAL;
+
+       if (ISSET(flags, VFS_RENAME_SWAP) && ISSET(flags, VFS_RENAME_EXCL))
+               return EINVAL;
+
+       vnode_t tvp, tdvp;
+       vnode_t fvp, fdvp;
+       struct nameidata *fromnd, *tond;
+       int error;
+       int do_retry;
+       int retry_count;
+       int mntrename;
+       int need_event;
+       const char *oname = NULL;
+       char *from_name = NULL, *to_name = NULL;
+       int from_len=0, to_len=0;
+       int holding_mntlock;
+       mount_t locked_mp = NULL;
+       vnode_t oparent = NULLVP;
+#if CONFIG_FSE
+       fse_info from_finfo, to_finfo;
+#endif
+       int from_truncated=0, to_truncated;
+       int batched = 0;
+       struct vnode_attr *fvap, *tvap;
+       int continuing = 0;
+       /* carving out a chunk for structs that are too big to be on stack. */
+       struct {
+               struct nameidata from_node, to_node;
+               struct vnode_attr fv_attr, tv_attr;
+       } * __rename_data;
+       MALLOC(__rename_data, void *, sizeof(*__rename_data), M_TEMP, M_WAITOK);
+       fromnd = &__rename_data->from_node;
+       tond = &__rename_data->to_node;
+
+       holding_mntlock = 0;
+       do_retry = 0;
+       retry_count = 0;
+retry:
+       fvp = tvp = NULL;
+       fdvp = tdvp = NULL;
+       fvap = tvap = NULL;
+       mntrename = FALSE;
+
+       NDINIT(fromnd, DELETE, OP_UNLINK, WANTPARENT | AUDITVNPATH1,
+           segflg, from, ctx);
+       fromnd->ni_flag = NAMEI_COMPOUNDRENAME;
+
+       NDINIT(tond, RENAME, OP_RENAME, WANTPARENT | AUDITVNPATH2 | CN_NBMOUNTLOOK,
+           segflg, to, ctx);
+       tond->ni_flag = NAMEI_COMPOUNDRENAME;
+
+continue_lookup:
+       if ((fromnd->ni_flag & NAMEI_CONTLOOKUP) != 0 || !continuing) {
+               if ( (error = nameiat(fromnd, fromfd)) )
+                       goto out1;
+               fdvp = fromnd->ni_dvp;
+               fvp  = fromnd->ni_vp;
+
+               if (fvp && fvp->v_type == VDIR)
+                       tond->ni_cnd.cn_flags |= WILLBEDIR;
+       }
+
+       if ((tond->ni_flag & NAMEI_CONTLOOKUP) != 0 || !continuing) {
+               if ( (error = nameiat(tond, tofd)) ) {
+                       /*
+                        * Translate error code for rename("dir1", "dir2/.").
+                        */
+                       if (error == EISDIR && fvp->v_type == VDIR)
+                               error = EINVAL;
+                       goto out1;
+               }
+               tdvp = tond->ni_dvp;
+               tvp  = tond->ni_vp;
+       }
+
+#if DEVELOPMENT || DEBUG
+       /*
+        * XXX VSWAP: Check for entitlements or special flag here
+        * so we can restrict access appropriately.
+        */
+#else /* DEVELOPMENT || DEBUG */
+
+       if (fromnd->ni_vp && vnode_isswap(fromnd->ni_vp) && (ctx != vfs_context_kernel())) {
+               error = EPERM;
+               goto out1;
+       }
+
+       if (tond->ni_vp && vnode_isswap(tond->ni_vp) && (ctx != vfs_context_kernel())) {
+               error = EPERM;
+               goto out1;
+       }
+#endif /* DEVELOPMENT || DEBUG */
+
+       if (!tvp && ISSET(flags, VFS_RENAME_SWAP)) {
+               error = ENOENT;
+               goto out1;
+       }
+
+       if (tvp && ISSET(flags, VFS_RENAME_EXCL)) {
+               error = EEXIST;
+               goto out1;
+       }
+
+       batched = vnode_compound_rename_available(fdvp);
+
+#if CONFIG_FSE
+       need_event = need_fsevent(FSE_RENAME, fdvp);
+       if (need_event) {
+               if (fvp) {
+                       get_fse_info(fvp, &from_finfo, ctx);
+               } else {
+                       error = vfs_get_notify_attributes(&__rename_data->fv_attr);
+                       if (error) {
+                               goto out1;
+                       }
+
+                       fvap = &__rename_data->fv_attr;
+               }
+
+               if (tvp) {
+                       get_fse_info(tvp, &to_finfo, ctx);
+               } else if (batched) {
+                       error = vfs_get_notify_attributes(&__rename_data->tv_attr);
+                       if (error) {
+                               goto out1;
+                       }
+
+                       tvap = &__rename_data->tv_attr;
+               }
+       }
+#else
+       need_event = 0;
+#endif /* CONFIG_FSE */
+
+       if (need_event || kauth_authorize_fileop_has_listeners()) {
+               if (from_name == NULL) {
+                       GET_PATH(from_name);
+                       if (from_name == NULL) {
+                               error = ENOMEM;
+                               goto out1;
+                       }
+               }
+
+               from_len = safe_getpath(fdvp, fromnd->ni_cnd.cn_nameptr, from_name, MAXPATHLEN, &from_truncated);
+
+               if (to_name == NULL) {
+                       GET_PATH(to_name);
+                       if (to_name == NULL) {
+                               error = ENOMEM;
+                               goto out1;
+                       }
+               }
+
+               to_len = safe_getpath(tdvp, tond->ni_cnd.cn_nameptr, to_name, MAXPATHLEN, &to_truncated);
+       }
+       if (!fvp) {
+               /*
+                * Claim: this check will never reject a valid rename.
+                * For success, either fvp must be on the same mount as tdvp, or fvp must sit atop a vnode on the same mount as tdvp.
+                * Suppose fdvp and tdvp are not on the same mount.
+                * If fvp is on the same mount as tdvp, then fvp is not on the same mount as fdvp, so fvp is the root of its filesystem.  If fvp is the root,
+                *      then you can't move it to within another dir on the same mountpoint.
+                * If fvp sits atop a vnode on the same mount as fdvp, then that vnode must be part of the same mount as fdvp, which is a contradiction.
+                *
+                * If this check passes, then we are safe to pass these vnodes to the same FS.
+                */
+               if (fdvp->v_mount != tdvp->v_mount) {
+                       error = EXDEV;
+                       goto out1;
+               }
+               goto skipped_lookup;
+       }
+
+       if (!batched) {
+               error = vn_authorize_renamex_with_paths(fdvp, fvp, &fromnd->ni_cnd, from_name, tdvp, tvp, &tond->ni_cnd, to_name, ctx, flags, NULL);
+               if (error) {
+                       if (error == ENOENT) {
+                               assert(retry_count < MAX_AUTHORIZE_ENOENT_RETRIES);
+                               if (retry_count < MAX_AUTHORIZE_ENOENT_RETRIES) {
+                                       /*
+                                        * We encountered a race where after doing the namei, tvp stops
+                                        * being valid. If so, simply re-drive the rename call from the
+                                        * top.
+                                        */
+                                       do_retry = 1;
+                                       retry_count += 1;
+                               }
+                       }
+                       goto out1;
+               }
+       }
+
+        /*
+         * If the source and destination are the same (i.e. they're
+         * links to the same vnode) and the target file system is
+         * case sensitive, then there is nothing to do.
+        *
+        * XXX Come back to this.
+         */
+       if (fvp == tvp) {
+               int pathconf_val;
+
+               /*
+                * Note: if _PC_CASE_SENSITIVE selector isn't supported,
+                * then assume that this file system is case sensitive.
+                */
+               if (VNOP_PATHCONF(fvp, _PC_CASE_SENSITIVE, &pathconf_val, ctx) != 0 ||
+                   pathconf_val != 0) {
+                       goto out1;
+               }
+       }
+
+       /*
+        * Allow the renaming of mount points.
+        * - target must not exist
+        * - target must reside in the same directory as source
+        * - union mounts cannot be renamed
+        * - "/" cannot be renamed
+        *
+        * XXX Handle this in VFS after a continued lookup (if we missed
+        * in the cache to start off)
+        *
+        * N.B. If RENAME_SWAP is being used, then @tvp != NULL and so
+        * we'll skip past here.  The file system is responsible for
+        * checking that @tvp is not a descendent of @fvp and vice versa
+        * so it should always return EINVAL if either @tvp or @fvp is the
+        * root of a volume.
+        */
+       if ((fvp->v_flag & VROOT) &&
+           (fvp->v_type == VDIR) &&
+           (tvp == NULL)  &&
+           (fvp->v_mountedhere == NULL)  &&
+           (fdvp == tdvp)  &&
+           ((fvp->v_mount->mnt_flag & (MNT_UNION | MNT_ROOTFS)) == 0)  &&
+           (fvp->v_mount->mnt_vnodecovered != NULLVP)) {
+               vnode_t coveredvp;
+
+               /* switch fvp to the covered vnode */
+               coveredvp = fvp->v_mount->mnt_vnodecovered;
+               if ( (vnode_getwithref(coveredvp)) ) {
+                       error = ENOENT;
+                       goto out1;
+               }
+               vnode_put(fvp);
+
+               fvp = coveredvp;
+               mntrename = TRUE;
+       }
+       /*
+        * Check for cross-device rename.
+        */
+       if ((fvp->v_mount != tdvp->v_mount) ||
+           (tvp && (fvp->v_mount != tvp->v_mount))) {
+               error = EXDEV;
+               goto out1;
+       }
+
+       /*
+        * If source is the same as the destination (that is the
+        * same inode number) then there is nothing to do...
+        * EXCEPT if the underlying file system supports case
+        * insensitivity and is case preserving.  In this case
+        * the file system needs to handle the special case of
+        * getting the same vnode as target (fvp) and source (tvp).
+        *
+        * Only file systems that support pathconf selectors _PC_CASE_SENSITIVE
+        * and _PC_CASE_PRESERVING can have this exception, and they need to
+        * handle the special case of getting the same vnode as target and
+        * source.  NOTE: Then the target is unlocked going into vnop_rename,
+        * so not to cause locking problems. There is a single reference on tvp.
+        *
+        * NOTE - that fvp == tvp also occurs if they are hard linked and
+        * that correct behaviour then is just to return success without doing
+        * anything.
+        *
+        * XXX filesystem should take care of this itself, perhaps...
+        */
+       if (fvp == tvp && fdvp == tdvp) {
+               if (fromnd->ni_cnd.cn_namelen == tond->ni_cnd.cn_namelen &&
+                   !bcmp(fromnd->ni_cnd.cn_nameptr, tond->ni_cnd.cn_nameptr,
+                         fromnd->ni_cnd.cn_namelen)) {
+                       goto out1;
+               }
+       }
+
+       if (holding_mntlock && fvp->v_mount != locked_mp) {
+               /*
+                * we're holding a reference and lock
+                * on locked_mp, but it no longer matches
+                * what we want to do... so drop our hold
+                */
+               mount_unlock_renames(locked_mp);
+               mount_drop(locked_mp, 0);
+               holding_mntlock = 0;
+       }
+       if (tdvp != fdvp && fvp->v_type == VDIR) {
+               /*
+                * serialize renames that re-shape
+                * the tree... if holding_mntlock is
+                * set, then we're ready to go...
+                * otherwise we
+                * first need to drop the iocounts
+                * we picked up, second take the
+                * lock to serialize the access,
+                * then finally start the lookup
+                * process over with the lock held
+                */
+               if (!holding_mntlock) {
+                       /*
+                        * need to grab a reference on
+                        * the mount point before we
+                        * drop all the iocounts... once
+                        * the iocounts are gone, the mount
+                        * could follow
+                        */
+                       locked_mp = fvp->v_mount;
+                       mount_ref(locked_mp, 0);
+
+                       /*
+                        * nameidone has to happen before we vnode_put(tvp)
+                        * since it may need to release the fs_nodelock on the tvp
+                        */
+                       nameidone(tond);
+
+                       if (tvp)
+                               vnode_put(tvp);
+                       vnode_put(tdvp);
+
+                       /*
+                        * nameidone has to happen before we vnode_put(fdvp)
+                        * since it may need to release the fs_nodelock on the fvp
+                        */
+                       nameidone(fromnd);
+
+                       vnode_put(fvp);
+                       vnode_put(fdvp);
+
+                       mount_lock_renames(locked_mp);
+                       holding_mntlock = 1;
+
+                       goto retry;
+               }
+       } else {
+               /*
+                * when we dropped the iocounts to take
+                * the lock, we allowed the identity of
+                * the various vnodes to change... if they did,
+                * we may no longer be dealing with a rename
+                * that reshapes the tree... once we're holding
+                * the iocounts, the vnodes can't change type
+                * so we're free to drop the lock at this point
+                * and continue on
+                */
+               if (holding_mntlock) {
+                       mount_unlock_renames(locked_mp);
+                       mount_drop(locked_mp, 0);
+                       holding_mntlock = 0;
+               }
+       }
+
+       // save these off so we can later verify that fvp is the same
+       oname   = fvp->v_name;
+       oparent = fvp->v_parent;
+
+skipped_lookup:
+       error = vn_rename(fdvp, &fvp, &fromnd->ni_cnd, fvap,
+                           tdvp, &tvp, &tond->ni_cnd, tvap,
+                           flags, ctx);
+
+       if (holding_mntlock) {
+               /*
+                * we can drop our serialization
+                * lock now
+                */
+               mount_unlock_renames(locked_mp);
+               mount_drop(locked_mp, 0);
+               holding_mntlock = 0;
+       }
+       if (error) {
+               if (error == EKEEPLOOKING) {
+                       if ((fromnd->ni_flag & NAMEI_CONTLOOKUP) == 0) {
+                               if ((tond->ni_flag & NAMEI_CONTLOOKUP) == 0) {
+                                       panic("EKEEPLOOKING without NAMEI_CONTLOOKUP on either ndp?");
+                               }
+                       }
+
+                       fromnd->ni_vp = fvp;
+                       tond->ni_vp = tvp;
+
+                       goto continue_lookup;
+               }
+
+               /*
+                * We may encounter a race in the VNOP where the destination didn't
+                * exist when we did the namei, but it does by the time we go and
+                * try to create the entry. In this case, we should re-drive this rename
+                * call from the top again.  Currently, only HFS bubbles out ERECYCLE,
+                * but other filesystems susceptible to this race could return it, too.
+                */
+               if (error == ERECYCLE) {
+                       do_retry = 1;
+               }
+
+               /*
+                * For compound VNOPs, the authorization callback may return
+                * ENOENT in case of racing hardlink lookups hitting the name
+                * cache, redrive the lookup.
+                */
+               if (batched && error == ENOENT) {
+                       assert(retry_count < MAX_AUTHORIZE_ENOENT_RETRIES);
+                       if (retry_count < MAX_AUTHORIZE_ENOENT_RETRIES) {
+                               do_retry = 1;
+                               retry_count += 1;
+                       }
+               }
+
+               goto out1;
+       }
+
+       /* call out to allow 3rd party notification of rename.
+        * Ignore result of kauth_authorize_fileop call.
+        */
+       kauth_authorize_fileop(vfs_context_ucred(ctx),
+                       KAUTH_FILEOP_RENAME,
+                       (uintptr_t)from_name, (uintptr_t)to_name);
+       if (flags & VFS_RENAME_SWAP) {
+               kauth_authorize_fileop(vfs_context_ucred(ctx),
+                                                          KAUTH_FILEOP_RENAME,
+                                                          (uintptr_t)to_name, (uintptr_t)from_name);
+       }
+
+#if CONFIG_FSE
+       if (from_name != NULL && to_name != NULL) {
+               if (from_truncated || to_truncated) {
+                       // set it here since only the from_finfo gets reported up to user space
+                       from_finfo.mode |= FSE_TRUNCATED_PATH;
+               }
+
+               if (tvap && tvp) {
+                       vnode_get_fse_info_from_vap(tvp, &to_finfo, tvap);
+               }
+               if (fvap) {
+                       vnode_get_fse_info_from_vap(fvp, &from_finfo, fvap);
+               }
+
+               if (tvp) {
+                       add_fsevent(FSE_RENAME, ctx,
+                                               FSE_ARG_STRING, from_len, from_name,
+                                               FSE_ARG_FINFO, &from_finfo,
+                                               FSE_ARG_STRING, to_len, to_name,
+                                               FSE_ARG_FINFO, &to_finfo,
+                                               FSE_ARG_DONE);
+                       if (flags & VFS_RENAME_SWAP) {
+                               /*
+                                * Strictly speaking, swap is the equivalent of
+                                * *three* renames.  FSEvents clients should only take
+                                * the events as a hint, so we only bother reporting
+                                * two.
+                                */
+                               add_fsevent(FSE_RENAME, ctx,
+                                                       FSE_ARG_STRING, to_len, to_name,
+                                                       FSE_ARG_FINFO, &to_finfo,
+                                                       FSE_ARG_STRING, from_len, from_name,
+                                                       FSE_ARG_FINFO, &from_finfo,
+                                                       FSE_ARG_DONE);
+                       }
+               } else {
+                       add_fsevent(FSE_RENAME, ctx,
+                                   FSE_ARG_STRING, from_len, from_name,
+                                   FSE_ARG_FINFO, &from_finfo,
+                                   FSE_ARG_STRING, to_len, to_name,
+                                   FSE_ARG_DONE);
+               }
+       }
+#endif /* CONFIG_FSE */
+
+       /*
+        * update filesystem's mount point data
+        */
+       if (mntrename) {
+               char *cp, *pathend, *mpname;
+               char * tobuf;
+               struct mount *mp;
+               int maxlen;
+               size_t len = 0;
+
+               mp = fvp->v_mountedhere;
+
+               if (vfs_busy(mp, LK_NOWAIT)) {
+                       error = EBUSY;
+                       goto out1;
+               }
+               MALLOC_ZONE(tobuf, char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
+
+               if (UIO_SEG_IS_USER_SPACE(segflg))
+                       error = copyinstr(to, tobuf, MAXPATHLEN, &len);
+               else
+                       error = copystr((void *)to, tobuf, MAXPATHLEN, &len);
+               if (!error) {
+                       /* find current mount point prefix */
+                       pathend = &mp->mnt_vfsstat.f_mntonname[0];
+                       for (cp = pathend; *cp != '\0'; ++cp) {
+                               if (*cp == '/')
+                                       pathend = cp + 1;
+                       }
+                       /* find last component of target name */
+                       for (mpname = cp = tobuf; *cp != '\0'; ++cp) {
+                               if (*cp == '/')
+                                       mpname = cp + 1;
+                       }
+                       /* append name to prefix */
+                       maxlen = MAXPATHLEN - (pathend - mp->mnt_vfsstat.f_mntonname);
+                       bzero(pathend, maxlen);
+                       strlcpy(pathend, mpname, maxlen);
+               }
+               FREE_ZONE(tobuf, MAXPATHLEN, M_NAMEI);
+
+               vfs_unbusy(mp);
+       }
+       /*
+        * fix up name & parent pointers.  note that we first
+        * check that fvp has the same name/parent pointers it
+        * had before the rename call... this is a 'weak' check
+        * at best...
+        *
+        * XXX oparent and oname may not be set in the compound vnop case
+        */
+       if (batched || (oname == fvp->v_name && oparent == fvp->v_parent)) {
+               int update_flags;
+
+               update_flags = VNODE_UPDATE_NAME;
+
+               if (fdvp != tdvp)
+                       update_flags |= VNODE_UPDATE_PARENT;
+
+               vnode_update_identity(fvp, tdvp, tond->ni_cnd.cn_nameptr, tond->ni_cnd.cn_namelen, tond->ni_cnd.cn_hash, update_flags);
+       }
+out1:
+       if (to_name != NULL) {
+               RELEASE_PATH(to_name);
+               to_name = NULL;
+       }
+       if (from_name != NULL) {
+               RELEASE_PATH(from_name);
+               from_name = NULL;
+       }
+       if (holding_mntlock) {
+               mount_unlock_renames(locked_mp);
+               mount_drop(locked_mp, 0);
+               holding_mntlock = 0;
+       }
+       if (tdvp) {
+               /*
+                * nameidone has to happen before we vnode_put(tdvp)
+                * since it may need to release the fs_nodelock on the tdvp
+                */
+               nameidone(tond);
+
+               if (tvp)
+                       vnode_put(tvp);
+               vnode_put(tdvp);
+       }
+       if (fdvp) {
+               /*
+                * nameidone has to happen before we vnode_put(fdvp)
+                * since it may need to release the fs_nodelock on the fdvp
+                */
+               nameidone(fromnd);
+
+               if (fvp)
+                       vnode_put(fvp);
+               vnode_put(fdvp);
+       }
+
+       /*
+        * If things changed after we did the namei, then we will re-drive
+        * this rename call from the top.
+        */
+       if (do_retry) {
+               do_retry = 0;
+               goto retry;
+       }
+
+       FREE(__rename_data, M_TEMP);
+       return (error);
+}
+
+int
+rename(__unused proc_t p, struct rename_args *uap, __unused int32_t *retval)
+{
+       return (renameat_internal(vfs_context_current(), AT_FDCWD, uap->from,
+           AT_FDCWD, uap->to, UIO_USERSPACE, 0));
+}
+
+int renameatx_np(__unused proc_t p, struct renameatx_np_args *uap, __unused int32_t *retval)
+{
+       return renameat_internal(
+               vfs_context_current(),
+               uap->fromfd, uap->from,
+               uap->tofd, uap->to,
+               UIO_USERSPACE, uap->flags);
+}
+
+int
+renameat(__unused proc_t p, struct renameat_args *uap, __unused int32_t *retval)
+{
+       return (renameat_internal(vfs_context_current(), uap->fromfd, uap->from,
+           uap->tofd, uap->to, UIO_USERSPACE, 0));
+}
+
+/*
+ * Make a directory file.
+ *
+ * Returns:    0                       Success
+ *             EEXIST
+ *     namei:???
+ *     vnode_authorize:???
+ *     vn_create:???
+ */
+/* ARGSUSED */
+static int
+mkdir1at(vfs_context_t ctx, user_addr_t path, struct vnode_attr *vap, int fd,
+    enum uio_seg segflg)
+{
+       vnode_t vp, dvp;
+       int error;
+       int update_flags = 0;
+       int batched;
+       struct nameidata nd;
+
+       AUDIT_ARG(mode, vap->va_mode);
+       NDINIT(&nd, CREATE, OP_MKDIR, LOCKPARENT | AUDITVNPATH1, segflg,
+              path, ctx);
+       nd.ni_cnd.cn_flags |= WILLBEDIR;
+       nd.ni_flag = NAMEI_COMPOUNDMKDIR;
+
+continue_lookup:
+       error = nameiat(&nd, fd);
+       if (error)
+               return (error);
+       dvp = nd.ni_dvp;
+       vp = nd.ni_vp;
+
+       if (vp != NULL) {
+               error = EEXIST;
+               goto out;
+       }
+
+       batched = vnode_compound_mkdir_available(dvp);
+
+       VATTR_SET(vap, va_type, VDIR);
+
+       /*
+        * XXX
+        * Don't authorize in VFS for compound VNOP.... mkdir -p today assumes that it will
+        * only get EXISTS or EISDIR for existing path components, and not that it could see
+        * EACCESS/EPERM--so if we authorize for mkdir on "/" for "mkdir -p /tmp/foo/bar/baz"
+        * it will fail in a spurious  manner.  Need to figure out if this is valid behavior.
+        */
+       if ((error = vn_authorize_mkdir(dvp, &nd.ni_cnd, vap, ctx, NULL)) != 0) {
+               if (error == EACCES || error == EPERM) {
+                       int error2;
+
+                       nameidone(&nd);
+                       vnode_put(dvp);
+                       dvp = NULLVP;
+
+                       /*
+                        * Try a lookup without "NAMEI_COMPOUNDVNOP" to make sure we return EEXIST
+                        * rather than EACCESS if the target exists.
+                        */
+                       NDINIT(&nd, LOOKUP, OP_MKDIR, AUDITVNPATH1, segflg,
+                                       path, ctx);
+                       error2 = nameiat(&nd, fd);
+                       if (error2) {
+                               goto out;
+                       } else {
+                               vp = nd.ni_vp;
+                               error = EEXIST;
+                               goto out;
+                       }
+               }
+
+               goto out;
+       }
+
+       /*
+        * make the directory
+        */
+       if ((error = vn_create(dvp, &vp, &nd, vap, 0, 0, NULL, ctx)) != 0) {
+               if (error == EKEEPLOOKING) {
+                       nd.ni_vp = vp;
+                       goto continue_lookup;
+               }
+
+               goto out;
+       }
+
+       // Make sure the name & parent pointers are hooked up
+       if (vp->v_name == NULL)
+               update_flags |= VNODE_UPDATE_NAME;
+       if (vp->v_parent == NULLVP)
+               update_flags |= VNODE_UPDATE_PARENT;
+
+       if (update_flags)
+               vnode_update_identity(vp, dvp, nd.ni_cnd.cn_nameptr, nd.ni_cnd.cn_namelen, nd.ni_cnd.cn_hash, update_flags);
+
+#if CONFIG_FSE
+       add_fsevent(FSE_CREATE_DIR, ctx, FSE_ARG_VNODE, vp, FSE_ARG_DONE);
+#endif
+
+out:
+       /*
+        * nameidone has to happen before we vnode_put(dvp)
+        * since it may need to release the fs_nodelock on the dvp
+        */
+       nameidone(&nd);
+
+       if (vp)
+               vnode_put(vp);
+       if (dvp)
+               vnode_put(dvp);
+
+       return (error);
+}
+
+/*
+ * mkdir_extended: Create a directory; with extended security (ACL).
+ *
+ * Parameters:    p                       Process requesting to create the directory
+ *                uap                     User argument descriptor (see below)
+ *                retval                  (ignored)
+ *
+ * Indirect:      uap->path               Path of directory to create
+ *                uap->mode               Access permissions to set
+ *                uap->xsecurity          ACL to set
+ *
+ * Returns:        0                      Success
+ *                !0                      Not success
+ *
+ */
+int
+mkdir_extended(proc_t p, struct mkdir_extended_args *uap, __unused int32_t *retval)
+{
+       int ciferror;
+       kauth_filesec_t xsecdst;
+       struct vnode_attr va;
+
+       AUDIT_ARG(owner, uap->uid, uap->gid);
+
+       xsecdst = NULL;
+       if ((uap->xsecurity != USER_ADDR_NULL) &&
+           ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0))
+               return ciferror;
+
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_mode, (uap->mode & ACCESSPERMS) & ~p->p_fd->fd_cmask);
+       if (xsecdst != NULL)
+               VATTR_SET(&va, va_acl, &xsecdst->fsec_acl);
+
+       ciferror = mkdir1at(vfs_context_current(), uap->path, &va, AT_FDCWD,
+           UIO_USERSPACE);
+       if (xsecdst != NULL)
+               kauth_filesec_free(xsecdst);
+       return ciferror;
+}
+
+int
+mkdir(proc_t p, struct mkdir_args *uap, __unused int32_t *retval)
+{
+       struct vnode_attr va;
+
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_mode, (uap->mode & ACCESSPERMS) & ~p->p_fd->fd_cmask);
+
+       return (mkdir1at(vfs_context_current(), uap->path, &va, AT_FDCWD,
+           UIO_USERSPACE));
+}
+
+int
+mkdirat(proc_t p, struct mkdirat_args *uap, __unused int32_t *retval)
+{
+       struct vnode_attr va;
+
+       VATTR_INIT(&va);
+       VATTR_SET(&va, va_mode, (uap->mode & ACCESSPERMS) & ~p->p_fd->fd_cmask);
+
+       return(mkdir1at(vfs_context_current(), uap->path, &va, uap->fd,
+           UIO_USERSPACE));
+}
+
+static int
+rmdirat_internal(vfs_context_t ctx, int fd, user_addr_t dirpath,
+    enum uio_seg segflg)
+{
+       vnode_t vp, dvp;
+       int error;
+       struct nameidata nd;
+       char     *path = NULL;
+       int       len=0;
+       int has_listeners = 0;
+       int need_event = 0;
+       int truncated = 0;
+#if CONFIG_FSE
+       struct vnode_attr va;
+#endif /* CONFIG_FSE */
+       struct vnode_attr *vap = NULL;
+       int restart_count = 0;
+       int batched;
+
+       int restart_flag;
+
+       /*
+        * This loop exists to restart rmdir in the unlikely case that two
+        * processes are simultaneously trying to remove the same directory
+        * containing orphaned appleDouble files.
+        */
+       do {
+               NDINIT(&nd, DELETE, OP_RMDIR, LOCKPARENT | AUDITVNPATH1,
+                   segflg, dirpath, ctx);
+               nd.ni_flag = NAMEI_COMPOUNDRMDIR;
+continue_lookup:
+               restart_flag = 0;
+               vap = NULL;
+
+               error = nameiat(&nd, fd);
+               if (error)
+                       return (error);
+
+               dvp = nd.ni_dvp;
+               vp = nd.ni_vp;
+
+               if (vp) {
+                       batched = vnode_compound_rmdir_available(vp);
+
+                       if (vp->v_flag & VROOT) {
+                               /*
+                                * The root of a mounted filesystem cannot be deleted.
+                                */
+                               error = EBUSY;
+                               goto out;
+                       }
+
+#if DEVELOPMENT || DEBUG
+                       /*
+                        * XXX VSWAP: Check for entitlements or special flag here
+                        * so we can restrict access appropriately.
+                        */
+#else /* DEVELOPMENT || DEBUG */
+
+                       if (vnode_isswap(vp) && (ctx != vfs_context_kernel())) {
+                               error = EPERM;
+                               goto out;
+                       }
+#endif /* DEVELOPMENT || DEBUG */
+
+                       /*
+                        * Removed a check here; we used to abort if vp's vid
+                        * was not the same as what we'd seen the last time around.
+                        * I do not think that check was valid, because if we retry
+                        * and all dirents are gone, the directory could legitimately
+                        * be recycled but still be present in a situation where we would
+                        * have had permission to delete.  Therefore, we won't make
+                        * an effort to preserve that check now that we may not have a
+                        * vp here.
+                        */
+
+                       if (!batched) {
+                               error = vn_authorize_rmdir(dvp, vp, &nd.ni_cnd, ctx, NULL);
+                               if (error) {
+                                       if (error == ENOENT) {
+                                               assert(restart_count < MAX_AUTHORIZE_ENOENT_RETRIES);
+                                               if (restart_count < MAX_AUTHORIZE_ENOENT_RETRIES) {
+                                                       restart_flag = 1;
+                                                       restart_count += 1;
+                                               }
+                                       }
+                                       goto out;
+                               }
+                       }
+               } else {
+                       batched = 1;
+
+                       if (!vnode_compound_rmdir_available(dvp)) {
+                               panic("No error, but no compound rmdir?");
+                       }
+               }
+
+#if CONFIG_FSE
+               fse_info  finfo;
+
+               need_event = need_fsevent(FSE_DELETE, dvp);
+               if (need_event) {
+                       if (!batched) {
+                               get_fse_info(vp, &finfo, ctx);
+                       } else {
+                               error = vfs_get_notify_attributes(&va);
+                               if (error) {
+                                       goto out;
+                               }
+
+                               vap = &va;
+                       }
+               }
+#endif
+               has_listeners = kauth_authorize_fileop_has_listeners();
+               if (need_event || has_listeners) {
+                       if (path == NULL) {
+                               GET_PATH(path);
+                               if (path == NULL) {
+                                       error = ENOMEM;
+                                       goto out;
+                               }
+                       }
+
+                       len = safe_getpath(dvp, nd.ni_cnd.cn_nameptr, path, MAXPATHLEN, &truncated);
+#if CONFIG_FSE
+                       if (truncated) {
+                               finfo.mode |= FSE_TRUNCATED_PATH;
+                       }
+#endif
+               }
+
+               error = vn_rmdir(dvp, &vp, &nd, vap, ctx);
+               nd.ni_vp = vp;
+               if (vp == NULLVP) {
+                       /* Couldn't find a vnode */
+                       goto out;
+               }
+
+               if (error == EKEEPLOOKING) {
+                       goto continue_lookup;
+               } else if (batched && error == ENOENT) {
+                       assert(restart_count < MAX_AUTHORIZE_ENOENT_RETRIES);
+                       if (restart_count < MAX_AUTHORIZE_ENOENT_RETRIES) {
+                               /*
+                                * For compound VNOPs, the authorization callback
+                                * may return ENOENT in case of racing hard link lookups
+                                * redrive the lookup.
+                                */
+                               restart_flag = 1;
+                               restart_count += 1;
+                               goto out;
+                       }
+               }
+#if CONFIG_APPLEDOUBLE
+               /*
+                * Special case to remove orphaned AppleDouble
+                * files. I don't like putting this in the kernel,
+                * but carbon does not like putting this in carbon either,
+                * so here we are.
+                */
+               if (error == ENOTEMPTY) {
+                       error = rmdir_remove_orphaned_appleDouble(vp, ctx, &restart_flag);
+                       if (error == EBUSY) {
+                               goto out;
+                       }
+
+
+                       /*
+                        * Assuming everything went well, we will try the RMDIR again
+                        */
+                       if (!error)
+                               error = vn_rmdir(dvp, &vp, &nd, vap, ctx);
+               }
+#endif /* CONFIG_APPLEDOUBLE */
+               /*
+                * Call out to allow 3rd party notification of delete.
+                * Ignore result of kauth_authorize_fileop call.
+                */
+               if (!error) {
+                       if (has_listeners) {
+                               kauth_authorize_fileop(vfs_context_ucred(ctx),
+                                               KAUTH_FILEOP_DELETE,
+                                               (uintptr_t)vp,
+                                               (uintptr_t)path);
+                       }
+
+                       if (vp->v_flag & VISHARDLINK) {
+                               // see the comment in unlink1() about why we update
+                               // the parent of a hard link when it is removed
+                               vnode_update_identity(vp, NULL, NULL, 0, 0, VNODE_UPDATE_PARENT);
+                       }
+
+#if CONFIG_FSE
+                       if (need_event) {
+                               if (vap) {
+                                       vnode_get_fse_info_from_vap(vp, &finfo, vap);
+                               }
+                               add_fsevent(FSE_DELETE, ctx,
+                                               FSE_ARG_STRING, len, path,
+                                               FSE_ARG_FINFO, &finfo,
+                                               FSE_ARG_DONE);
+                       }
+#endif
+               }
+
+out:
+               if (path != NULL) {
+                       RELEASE_PATH(path);
+                       path = NULL;
+               }
+               /*
+                * nameidone has to happen before we vnode_put(dvp)
+                * since it may need to release the fs_nodelock on the dvp
+                */
+               nameidone(&nd);
+               vnode_put(dvp);
+
+               if (vp)
+                       vnode_put(vp);
+
+               if (restart_flag == 0) {
+                       wakeup_one((caddr_t)vp);
+                       return (error);
+               }
+               tsleep(vp, PVFS, "rm AD", 1);
+
+       } while (restart_flag != 0);
+
+       return (error);
+
+}
+
+/*
+ * Remove a directory file.
+ */
+/* ARGSUSED */
+int
+rmdir(__unused proc_t p, struct rmdir_args *uap, __unused int32_t *retval)
+{
+       return (rmdirat_internal(vfs_context_current(), AT_FDCWD,
+           CAST_USER_ADDR_T(uap->path), UIO_USERSPACE));
+}
+
+/* Get direntry length padded to 8 byte alignment */
+#define DIRENT64_LEN(namlen) \
+       ((sizeof(struct direntry) + (namlen) - (MAXPATHLEN-1) + 7) & ~7)
+
+/* Get dirent length padded to 4 byte alignment */
+#define DIRENT_LEN(namelen) \
+       ((sizeof(struct dirent) + (namelen + 1) - (__DARWIN_MAXNAMLEN + 1) + 3) & ~3)
+
+/* Get the end of this dirent */
+#define DIRENT_END(dep) \
+       (((char *)(dep)) + (dep)->d_reclen - 1)
+
+errno_t
+vnode_readdir64(struct vnode *vp, struct uio *uio, int flags, int *eofflag,
+                int *numdirent, vfs_context_t ctxp)
+{
+       /* Check if fs natively supports VNODE_READDIR_EXTENDED */
+       if ((vp->v_mount->mnt_vtable->vfc_vfsflags & VFC_VFSREADDIR_EXTENDED) &&
+                  ((vp->v_mount->mnt_kern_flag & MNTK_DENY_READDIREXT) == 0))  {
+               return VNOP_READDIR(vp, uio, flags, eofflag, numdirent, ctxp);
+       } else {
+               size_t bufsize;
+               void * bufptr;
+               uio_t auio;
+               struct direntry *entry64;
+               struct dirent *dep;
+               int bytesread;
+               int error;
+
+               /*
+                * We're here because the underlying file system does not
+                * support direnties or we mounted denying support so we must
+                * fall back to dirents and convert them to direntries.
+                *
+                * Our kernel buffer needs to be smaller since re-packing will
+                * expand each dirent.  The worse case (when the name length
+                * is 3 or less) corresponds to a struct direntry size of 32
+                * bytes (8-byte aligned) and a struct dirent size of 12 bytes
+                * (4-byte aligned).  So having a buffer that is 3/8 the size
+                * will prevent us from reading more than we can pack.
+                 *
+                * Since this buffer is wired memory, we will limit the
+                * buffer size to a maximum of 32K. We would really like to
+                * use 32K in the MIN(), but we use magic number 87371 to
+                * prevent uio_resid() * 3 / 8 from overflowing.
+                */
+               bufsize = 3 * MIN((user_size_t)uio_resid(uio), 87371u) / 8;
+               MALLOC(bufptr, void *, bufsize, M_TEMP, M_WAITOK);
+               if (bufptr == NULL) {
+                       return ENOMEM;
+               }
+
+               auio = uio_create(1, 0, UIO_SYSSPACE, UIO_READ);
+               uio_addiov(auio, (uintptr_t)bufptr, bufsize);
+               auio->uio_offset = uio->uio_offset;
+
+               error = VNOP_READDIR(vp, auio, 0, eofflag, numdirent, ctxp);
+
+               dep = (struct dirent *)bufptr;
+               bytesread = bufsize - uio_resid(auio);
+
+               MALLOC(entry64, struct direntry *, sizeof(struct direntry),
+                      M_TEMP, M_WAITOK);
+               /*
+                * Convert all the entries and copy them out to user's buffer.
+                */
+               while (error == 0 && (char *)dep < ((char *)bufptr + bytesread)) {
+                       size_t  enbufsize = DIRENT64_LEN(dep->d_namlen);
+
+                       if (DIRENT_END(dep) > ((char *)bufptr + bytesread) ||
+                           DIRENT_LEN(dep->d_namlen) > dep->d_reclen) {
+                               printf("%s: %s: Bad dirent recived from directory %s\n", __func__,
+                                      vp->v_mount->mnt_vfsstat.f_mntonname,
+                                      vp->v_name ? vp->v_name : "<unknown>");
+                               error = EIO;
+                               break;
+                       }
+
+                       bzero(entry64, enbufsize);
+                       /* Convert a dirent to a dirent64. */
+                       entry64->d_ino = dep->d_ino;
+                       entry64->d_seekoff = 0;
+                       entry64->d_reclen = enbufsize;
+                       entry64->d_namlen = dep->d_namlen;
+                       entry64->d_type = dep->d_type;
+                       bcopy(dep->d_name, entry64->d_name, dep->d_namlen + 1);
+
+                       /* Move to next entry. */
+                       dep = (struct dirent *)((char *)dep + dep->d_reclen);
+
+                       /* Copy entry64 to user's buffer. */
+                       error = uiomove((caddr_t)entry64, entry64->d_reclen, uio);
+               }
+
+               /* Update the real offset using the offset we got from VNOP_READDIR. */
+               if (error == 0) {
+                       uio->uio_offset = auio->uio_offset;
+               }
+               uio_free(auio);
+               FREE(bufptr, M_TEMP);
+               FREE(entry64, M_TEMP);
+               return (error);
+       }
+}
+
+#define GETDIRENTRIES_MAXBUFSIZE       (128 * 1024 * 1024U)
+
+/*
+ * Read a block of directory entries in a file system independent format.
+ */
+static int
+getdirentries_common(int fd, user_addr_t bufp, user_size_t bufsize, ssize_t *bytesread,
+                     off_t *offset, int flags)
+{
+       vnode_t vp;
+       struct vfs_context context = *vfs_context_current();    /* local copy */
+       struct fileproc *fp;
+       uio_t auio;
+       int spacetype = proc_is64bit(vfs_context_proc(&context)) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       off_t loff;
+       int error, eofflag, numdirent;
+       char uio_buf[ UIO_SIZEOF(1) ];
+
+       error = fp_getfvp(vfs_context_proc(&context), fd, &fp, &vp);
+       if (error) {
+               return (error);
+       }
+       if ((fp->f_fglob->fg_flag & FREAD) == 0) {
+               AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
+               error = EBADF;
+               goto out;
+       }
+
+       if (bufsize > GETDIRENTRIES_MAXBUFSIZE)
+               bufsize = GETDIRENTRIES_MAXBUFSIZE;
+
+#if CONFIG_MACF
+       error = mac_file_check_change_offset(vfs_context_ucred(&context), fp->f_fglob);
+       if (error)
+               goto out;
+#endif
+       if ( (error = vnode_getwithref(vp)) ) {
+               goto out;
+       }
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+
+unionread:
+       if (vp->v_type != VDIR) {
+               (void)vnode_put(vp);
+               error = EINVAL;
+               goto out;
+       }
+
+#if CONFIG_MACF
+       error = mac_vnode_check_readdir(&context, vp);
+       if (error != 0) {
+               (void)vnode_put(vp);
+               goto out;
+       }
+#endif /* MAC */
+
+       loff = fp->f_fglob->fg_offset;
+       auio = uio_createwithbuffer(1, loff, spacetype, UIO_READ, &uio_buf[0], sizeof(uio_buf));
+       uio_addiov(auio, bufp, bufsize);
+
+       if (flags & VNODE_READDIR_EXTENDED) {
+               error = vnode_readdir64(vp, auio, flags, &eofflag, &numdirent, &context);
+               fp->f_fglob->fg_offset = uio_offset(auio);
+       } else {
+               error = VNOP_READDIR(vp, auio, 0, &eofflag, &numdirent, &context);
+               fp->f_fglob->fg_offset = uio_offset(auio);
+       }
+       if (error) {
+               (void)vnode_put(vp);
+               goto out;
+       }
+
+       if ((user_ssize_t)bufsize == uio_resid(auio)){
+               if (union_dircheckp) {
+                       error = union_dircheckp(&vp, fp, &context);
+                       if (error == -1)
+                               goto unionread;
+                       if (error) {
+                               (void)vnode_put(vp);
+                               goto out;
+                       }
+               }
+
+               if ((vp->v_mount->mnt_flag & MNT_UNION)) {
+                       struct vnode *tvp = vp;
+                       if (lookup_traverse_union(tvp, &vp, &context) == 0) {
+                               vnode_ref(vp);
+                               fp->f_fglob->fg_data = (caddr_t) vp;
+                               fp->f_fglob->fg_offset = 0;
+                               vnode_rele(tvp);
+                               vnode_put(tvp);
+                               goto unionread;
+                       }
+                       vp = tvp;
+               }
+       }
+
+       vnode_put(vp);
+       if (offset) {
+               *offset = loff;
+       }
+
+       *bytesread = bufsize - uio_resid(auio);
+out:
+       file_drop(fd);
+       return (error);
+}
+
+
+int
+getdirentries(__unused struct proc *p, struct getdirentries_args *uap, int32_t *retval)
+{
+       off_t offset;
+       ssize_t bytesread;
+       int error;
+
+       AUDIT_ARG(fd, uap->fd);
+       error = getdirentries_common(uap->fd, uap->buf, uap->count, &bytesread, &offset, 0);
+
+       if (error == 0) {
+               if (proc_is64bit(p)) {
+                       user64_long_t base = (user64_long_t)offset;
+                       error = copyout((caddr_t)&base, uap->basep, sizeof(user64_long_t));
+               } else {
+                       user32_long_t base = (user32_long_t)offset;
+                       error = copyout((caddr_t)&base, uap->basep, sizeof(user32_long_t));
+               }
+               *retval = bytesread;
+       }
+       return (error);
+}
+
+int
+getdirentries64(__unused struct proc *p, struct getdirentries64_args *uap, user_ssize_t *retval)
+{
+       off_t offset;
+       ssize_t bytesread;
+       int error;
+
+       AUDIT_ARG(fd, uap->fd);
+       error = getdirentries_common(uap->fd, uap->buf, uap->bufsize, &bytesread, &offset, VNODE_READDIR_EXTENDED);
+
+       if (error == 0) {
+               *retval = bytesread;
+               error = copyout((caddr_t)&offset, uap->position, sizeof(off_t));
+       }
+       return (error);
+}
+
+
+/*
+ * Set the mode mask for creation of filesystem nodes.
+ * XXX implement xsecurity
+ */
+#define UMASK_NOXSECURITY       (void *)1      /* leave existing xsecurity alone */
+static int
+umask1(proc_t p, int newmask, __unused kauth_filesec_t fsec, int32_t *retval)
+{
+       struct filedesc *fdp;
+
+       AUDIT_ARG(mask, newmask);
+       proc_fdlock(p);
+       fdp = p->p_fd;
+       *retval = fdp->fd_cmask;
+       fdp->fd_cmask = newmask & ALLPERMS;
+       proc_fdunlock(p);
+       return (0);
+}
+
+/*
+ * umask_extended: Set the mode mask for creation of filesystem nodes; with extended security (ACL).
+ *
+ * Parameters:    p                       Process requesting to set the umask
+ *                uap                     User argument descriptor (see below)
+ *                retval                  umask of the process (parameter p)
+ *
+ * Indirect:      uap->newmask            umask to set
+ *                uap->xsecurity          ACL to set
+ *
+ * Returns:        0                      Success
+ *                !0                      Not success
+ *
+ */
+int
+umask_extended(proc_t p, struct umask_extended_args *uap, int32_t *retval)
+{
+       int ciferror;
+       kauth_filesec_t xsecdst;
+
+       xsecdst = KAUTH_FILESEC_NONE;
+       if (uap->xsecurity != USER_ADDR_NULL) {
+               if ((ciferror = kauth_copyinfilesec(uap->xsecurity, &xsecdst)) != 0)
+                       return ciferror;
+       } else {
+               xsecdst = KAUTH_FILESEC_NONE;
+       }
+
+       ciferror = umask1(p, uap->newmask, xsecdst, retval);
+
+       if (xsecdst != KAUTH_FILESEC_NONE)
+               kauth_filesec_free(xsecdst);
+       return ciferror;
+}
+
+int
+umask(proc_t p, struct umask_args *uap, int32_t *retval)
+{
+       return(umask1(p, uap->newmask, UMASK_NOXSECURITY, retval));
+}
+
+/*
+ * Void all references to file by ripping underlying filesystem
+ * away from vnode.
+ */
+/* ARGSUSED */
+int
+revoke(proc_t p, struct revoke_args *uap, __unused int32_t *retval)
+{
+       vnode_t vp;
+       struct vnode_attr va;
+       vfs_context_t ctx = vfs_context_current();
+       int error;
+       struct nameidata nd;
+
+       NDINIT(&nd, LOOKUP, OP_REVOKE, FOLLOW | AUDITVNPATH1, UIO_USERSPACE,
+              uap->path, ctx);
+       error = namei(&nd);
+       if (error)
+               return (error);
+       vp = nd.ni_vp;
+
+       nameidone(&nd);
+
+       if (!(vnode_ischr(vp) || vnode_isblk(vp))) {
+               error = ENOTSUP;
+               goto out;
+       }
+
+       if (vnode_isblk(vp) && vnode_ismountedon(vp)) {
+               error = EBUSY;
+               goto out;
+       }
+
+#if CONFIG_MACF
+       error = mac_vnode_check_revoke(ctx, vp);
+       if (error)
+               goto out;
+#endif
+
+       VATTR_INIT(&va);
+       VATTR_WANTED(&va, va_uid);
+       if ((error = vnode_getattr(vp, &va, ctx)))
+               goto out;
+       if (kauth_cred_getuid(vfs_context_ucred(ctx)) != va.va_uid &&
+           (error = suser(vfs_context_ucred(ctx), &p->p_acflag)))
+               goto out;
+       if (vp->v_usecount > 0 || (vnode_isaliased(vp)))
+               VNOP_REVOKE(vp, REVOKEALL, ctx);
+out:
+       vnode_put(vp);
+       return (error);
+}
+
+
+/*
+ *  HFS/HFS PlUS SPECIFIC SYSTEM CALLS
+ *  The following system calls are designed to support features
+ *  which are specific to the HFS & HFS Plus volume formats
+ */
+
+
+/*
+ * Obtain attribute information on objects in a directory while enumerating
+ * the directory.
+ */
+/* ARGSUSED */
+int
+getdirentriesattr (proc_t p, struct getdirentriesattr_args *uap, int32_t *retval)
+{
+       vnode_t vp;
+       struct fileproc *fp;
+       uio_t auio = NULL;
+       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       uint32_t count = 0, savecount = 0;
+       uint32_t newstate = 0;
+       int error, eofflag;
+       uint32_t loff = 0;
+       struct attrlist attributelist;
+       vfs_context_t ctx = vfs_context_current();
+       int fd = uap->fd;
+       char uio_buf[ UIO_SIZEOF(1) ];
+       kauth_action_t action;
+
+       AUDIT_ARG(fd, fd);
+
+       /* Get the attributes into kernel space */
+       if ((error = copyin(uap->alist, (caddr_t)&attributelist, sizeof(attributelist)))) {
+               return(error);
+       }
+       if ((error = copyin(uap->count, (caddr_t)&count, sizeof(count)))) {
+               return(error);
+       }
+       savecount = count;
+       if ( (error = fp_getfvp(p, fd, &fp, &vp)) ) {
+               return (error);
+       }
+       if ((fp->f_fglob->fg_flag & FREAD) == 0) {
+               AUDIT_ARG(vnpath_withref, vp, ARG_VNODE1);
+               error = EBADF;
+               goto out;
+       }
+
+
+#if CONFIG_MACF
+       error = mac_file_check_change_offset(vfs_context_ucred(ctx),
+           fp->f_fglob);
+       if (error)
+               goto out;
+#endif
+
+
+       if ( (error = vnode_getwithref(vp)) )
+               goto out;
+
+       AUDIT_ARG(vnpath, vp, ARG_VNODE1);
+
+unionread:
+       if (vp->v_type != VDIR) {
+               (void)vnode_put(vp);
+               error = EINVAL;
+               goto out;
+       }
+
+#if CONFIG_MACF
+       error = mac_vnode_check_readdir(ctx, vp);
+       if (error != 0) {
+               (void)vnode_put(vp);
+               goto out;
+       }
+#endif /* MAC */
+
+       /* set up the uio structure which will contain the users return buffer */
+       loff = fp->f_fglob->fg_offset;
+       auio = uio_createwithbuffer(1, loff, spacetype, UIO_READ, &uio_buf[0], sizeof(uio_buf));
+       uio_addiov(auio, uap->buffer, uap->buffersize);
+
+       /*
+        * If the only item requested is file names, we can let that past with
+        * just LIST_DIRECTORY.  If they want any other attributes, that means
+        * they need SEARCH as well.
+        */
+       action = KAUTH_VNODE_LIST_DIRECTORY;
+       if ((attributelist.commonattr & ~ATTR_CMN_NAME) ||
+           attributelist.fileattr || attributelist.dirattr)
+               action |= KAUTH_VNODE_SEARCH;
+
+       if ((error = vnode_authorize(vp, NULL, action, ctx)) == 0) {
+
+               /* Believe it or not, uap->options only has 32-bits of valid
+                * info, so truncate before extending again */
+
+               error = VNOP_READDIRATTR(vp, &attributelist, auio, count,
+                               (u_long)(uint32_t)uap->options, &newstate, &eofflag, &count, ctx);
+       }
+
+       if (error) {
+               (void) vnode_put(vp);
+               goto out;
+       }
+
+       /*
+        * If we've got the last entry of a directory in a union mount
+        * then reset the eofflag and pretend there's still more to come.
+        * The next call will again set eofflag and the buffer will be empty,
+        * so traverse to the underlying directory and do the directory
+        * read there.
+        */
+       if (eofflag && vp->v_mount->mnt_flag & MNT_UNION) {
+               if (uio_resid(auio) < (user_ssize_t) uap->buffersize) { // Got some entries
+                       eofflag = 0;
+               } else {                                                // Empty buffer
+                       struct vnode *tvp = vp;
+                       if (lookup_traverse_union(tvp, &vp, ctx) == 0) {
+                               vnode_ref_ext(vp, fp->f_fglob->fg_flag & O_EVTONLY, 0);
+                               fp->f_fglob->fg_data = (caddr_t) vp;
+                               fp->f_fglob->fg_offset = 0; // reset index for new dir
+                               count = savecount;
+                               vnode_rele_internal(tvp, fp->f_fglob->fg_flag & O_EVTONLY, 0, 0);
+                               vnode_put(tvp);
+                               goto unionread;
+                       }
+                       vp = tvp;
+               }
+       }
+
+       (void)vnode_put(vp);
+
+       if (error)
+               goto out;
+       fp->f_fglob->fg_offset = uio_offset(auio); /* should be multiple of dirent, not variable */
+
+       if ((error = copyout((caddr_t) &count, uap->count, sizeof(count))))
+               goto out;
+       if ((error = copyout((caddr_t) &newstate, uap->newstate, sizeof(newstate))))
+               goto out;
+       if ((error = copyout((caddr_t) &loff, uap->basep, sizeof(loff))))
+               goto out;
+
+       *retval = eofflag;  /* similar to getdirentries */
+       error = 0;
+out:
+       file_drop(fd);
+       return (error); /* return error earlier, an retval of 0 or 1 now */
+
+} /* end of getdirentriesattr system call */
+
+/*
+* Exchange data between two files
+*/
+
+/* ARGSUSED */
+int
+exchangedata (__unused proc_t p, struct exchangedata_args *uap, __unused int32_t *retval)
+{
+
+       struct nameidata fnd, snd;
+       vfs_context_t ctx = vfs_context_current();
+       vnode_t fvp;
+       vnode_t svp;
+       int error;
+       u_int32_t nameiflags;
+       char *fpath = NULL;
+       char *spath = NULL;
+       int   flen=0, slen=0;
+       int from_truncated=0, to_truncated=0;
+#if CONFIG_FSE
+       fse_info f_finfo, s_finfo;
+#endif
+
+       nameiflags = 0;
+       if ((uap->options & FSOPT_NOFOLLOW) == 0) nameiflags |= FOLLOW;
+
+       NDINIT(&fnd, LOOKUP, OP_EXCHANGEDATA, nameiflags | AUDITVNPATH1,
+              UIO_USERSPACE, uap->path1, ctx);
+
+       error = namei(&fnd);
+       if (error)
+               goto out2;
+
+       nameidone(&fnd);
+       fvp = fnd.ni_vp;
+
+       NDINIT(&snd, LOOKUP, OP_EXCHANGEDATA, CN_NBMOUNTLOOK | nameiflags | AUDITVNPATH2,
+               UIO_USERSPACE, uap->path2, ctx);
+
+       error = namei(&snd);
+       if (error) {
+               vnode_put(fvp);
+               goto out2;
+       }
+       nameidone(&snd);
+       svp = snd.ni_vp;
+
+       /*
+        * if the files are the same, return an inval error
+        */
+       if (svp == fvp) {
+               error = EINVAL;
+               goto out;
+       }
+
+       /*
+        * if the files are on different volumes, return an error
+        */
+       if (svp->v_mount != fvp->v_mount) {
+               error = EXDEV;
+               goto out;
+       }
+
+       /* If they're not files, return an error */
+       if ( (vnode_isreg(fvp) == 0) || (vnode_isreg(svp) == 0)) {
+               error = EINVAL;
+               goto out;
+       }
+
+#if CONFIG_MACF
+       error = mac_vnode_check_exchangedata(ctx,
+           fvp, svp);
+       if (error)
+               goto out;
+#endif
+       if (((error = vnode_authorize(fvp, NULL, KAUTH_VNODE_READ_DATA | KAUTH_VNODE_WRITE_DATA, ctx)) != 0) ||
+           ((error = vnode_authorize(svp, NULL, KAUTH_VNODE_READ_DATA | KAUTH_VNODE_WRITE_DATA, ctx)) != 0))
+               goto out;
+
+       if (
+#if CONFIG_FSE
+       need_fsevent(FSE_EXCHANGE, fvp) ||
+#endif
+       kauth_authorize_fileop_has_listeners()) {
+               GET_PATH(fpath);
+               GET_PATH(spath);
+               if (fpath == NULL || spath == NULL) {
+                       error = ENOMEM;
+                       goto out;
+               }
+
+               flen = safe_getpath(fvp, NULL, fpath, MAXPATHLEN, &from_truncated);
+               slen = safe_getpath(svp, NULL, spath, MAXPATHLEN, &to_truncated);
+
+#if CONFIG_FSE
+               get_fse_info(fvp, &f_finfo, ctx);
+               get_fse_info(svp, &s_finfo, ctx);
+               if (from_truncated || to_truncated) {
+                       // set it here since only the f_finfo gets reported up to user space
+                       f_finfo.mode |= FSE_TRUNCATED_PATH;
+               }
+#endif
+       }
+       /* Ok, make the call */
+       error = VNOP_EXCHANGE(fvp, svp, 0, ctx);
+
+       if (error == 0) {
+           const char *tmpname;
+
+           if (fpath != NULL && spath != NULL) {
+                   /* call out to allow 3rd party notification of exchangedata.
+                    * Ignore result of kauth_authorize_fileop call.
+                    */
+                   kauth_authorize_fileop(vfs_context_ucred(ctx), KAUTH_FILEOP_EXCHANGE,
+                                          (uintptr_t)fpath, (uintptr_t)spath);
+           }
+           name_cache_lock();
+
+           tmpname     = fvp->v_name;
+           fvp->v_name = svp->v_name;
+           svp->v_name = tmpname;
+
+           if (fvp->v_parent != svp->v_parent) {
+               vnode_t tmp;
+
+               tmp           = fvp->v_parent;
+               fvp->v_parent = svp->v_parent;
+               svp->v_parent = tmp;
+           }
+           name_cache_unlock();
+
+#if CONFIG_FSE
+           if (fpath != NULL && spath != NULL) {
+                   add_fsevent(FSE_EXCHANGE, ctx,
+                               FSE_ARG_STRING, flen, fpath,
+                               FSE_ARG_FINFO, &f_finfo,
+                               FSE_ARG_STRING, slen, spath,
+                               FSE_ARG_FINFO, &s_finfo,
+                               FSE_ARG_DONE);
+           }
+#endif
+       }
+
+out:
+       if (fpath != NULL)
+               RELEASE_PATH(fpath);
+       if (spath != NULL)
+               RELEASE_PATH(spath);
+       vnode_put(svp);
+       vnode_put(fvp);
+out2:
+        return (error);
+}
+
+/*
+ * Return (in MB) the amount of freespace on the given vnode's volume.
+ */
+uint32_t freespace_mb(vnode_t vp);
+
+uint32_t
+freespace_mb(vnode_t vp)
+{
+       vfs_update_vfsstat(vp->v_mount, vfs_context_current(), VFS_USER_EVENT);
+       return (((uint64_t)vp->v_mount->mnt_vfsstat.f_bavail *
+               vp->v_mount->mnt_vfsstat.f_bsize) >> 20);
+}
+
+#if CONFIG_SEARCHFS
+
+/* ARGSUSED */
+
+int
+searchfs(proc_t p, struct searchfs_args *uap, __unused int32_t *retval)
+{
+       vnode_t vp, tvp;
+       int i, error=0;
+       int fserror = 0;
+       struct nameidata nd;
+       struct user64_fssearchblock searchblock;
+       struct searchstate *state;
+       struct attrlist *returnattrs;
+       struct timeval timelimit;
+       void *searchparams1,*searchparams2;
+       uio_t auio = NULL;
+       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       uint32_t nummatches;
+       int mallocsize;
+       uint32_t nameiflags;
+       vfs_context_t ctx = vfs_context_current();
+       char uio_buf[ UIO_SIZEOF(1) ];
+
+       /* Start by copying in fsearchblock parameter list */
+    if (IS_64BIT_PROCESS(p)) {
+        error = copyin(uap->searchblock, (caddr_t) &searchblock, sizeof(searchblock));
+        timelimit.tv_sec = searchblock.timelimit.tv_sec;
+        timelimit.tv_usec = searchblock.timelimit.tv_usec;
+    }
+    else {
+        struct user32_fssearchblock tmp_searchblock;
+
+        error = copyin(uap->searchblock, (caddr_t) &tmp_searchblock, sizeof(tmp_searchblock));
+        // munge into 64-bit version
+        searchblock.returnattrs = CAST_USER_ADDR_T(tmp_searchblock.returnattrs);
+        searchblock.returnbuffer = CAST_USER_ADDR_T(tmp_searchblock.returnbuffer);
+        searchblock.returnbuffersize = tmp_searchblock.returnbuffersize;
+        searchblock.maxmatches = tmp_searchblock.maxmatches;
+               /*
+                * These casts are safe. We will promote the tv_sec into a 64 bit long if necessary
+                * from a 32 bit long, and tv_usec is already a signed 32 bit int.
+                */
+        timelimit.tv_sec = (__darwin_time_t) tmp_searchblock.timelimit.tv_sec;
+        timelimit.tv_usec = (__darwin_useconds_t) tmp_searchblock.timelimit.tv_usec;
+        searchblock.searchparams1 = CAST_USER_ADDR_T(tmp_searchblock.searchparams1);
+        searchblock.sizeofsearchparams1 = tmp_searchblock.sizeofsearchparams1;
+        searchblock.searchparams2 = CAST_USER_ADDR_T(tmp_searchblock.searchparams2);
+        searchblock.sizeofsearchparams2 = tmp_searchblock.sizeofsearchparams2;
+        searchblock.searchattrs = tmp_searchblock.searchattrs;
+    }
+       if (error)
+               return(error);
+
+       /* Do a sanity check on sizeofsearchparams1 and sizeofsearchparams2.
+        */
+       if (searchblock.sizeofsearchparams1 > SEARCHFS_MAX_SEARCHPARMS ||
+               searchblock.sizeofsearchparams2 > SEARCHFS_MAX_SEARCHPARMS)
+               return(EINVAL);
+
+       /* Now malloc a big bunch of space to hold the search parameters, the attrlists and the search state. */
+       /* It all has to do into local memory and it's not that big so we might as well  put it all together. */
+       /* Searchparams1 shall be first so we might as well use that to hold the base address of the allocated*/
+       /* block.                                                                                             */
+       /*                                                                                                    */
+       /* NOTE: we allocate an extra 8 bytes to account for the difference in size of the searchstate        */
+       /*       due to the changes in rdar://problem/12438273.  That way if a 3rd party file system          */
+       /*       assumes the size is still 556 bytes it will continue to work                                 */
+
+       mallocsize = searchblock.sizeofsearchparams1 + searchblock.sizeofsearchparams2 +
+               sizeof(struct attrlist) + sizeof(struct searchstate) + (2*sizeof(uint32_t));
+
+       MALLOC(searchparams1, void *, mallocsize, M_TEMP, M_WAITOK);
+
+       /* Now set up the various pointers to the correct place in our newly allocated memory */
+
+       searchparams2 = (void *) (((caddr_t) searchparams1) + searchblock.sizeofsearchparams1);
+       returnattrs = (struct attrlist *) (((caddr_t) searchparams2) + searchblock.sizeofsearchparams2);
+       state = (struct searchstate *) (((caddr_t) returnattrs) + sizeof (struct attrlist));
+
+       /* Now copy in the stuff given our local variables. */
+
+       if ((error = copyin(searchblock.searchparams1, searchparams1, searchblock.sizeofsearchparams1)))
+               goto freeandexit;
+
+       if ((error = copyin(searchblock.searchparams2, searchparams2, searchblock.sizeofsearchparams2)))
+               goto freeandexit;
+
+       if ((error = copyin(searchblock.returnattrs, (caddr_t) returnattrs, sizeof(struct attrlist))))
+               goto freeandexit;
+
+       if ((error = copyin(uap->state, (caddr_t) state, sizeof(struct searchstate))))
+               goto freeandexit;
+
+       /*
+        * When searching a union mount, need to set the
+        * start flag at the first call on each layer to
+        * reset state for the new volume.
+        */
+       if (uap->options & SRCHFS_START)
+               state->ss_union_layer = 0;
+       else
+               uap->options |= state->ss_union_flags;
+       state->ss_union_flags = 0;
+
+       /*
+        * Because searchparams1 and searchparams2 may contain an ATTR_CMN_NAME search parameter,
+        * which is passed in with an attrreference_t, we need to inspect the buffer manually here.
+        * The KPI does not provide us the ability to pass in the length of the buffers searchparams1
+        * and searchparams2. To obviate the need for all searchfs-supporting filesystems to
+        * validate the user-supplied data offset of the attrreference_t, we'll do it here.
+        */
+
+       if (searchblock.searchattrs.commonattr & ATTR_CMN_NAME) {
+               attrreference_t* string_ref;
+               u_int32_t* start_length;
+               user64_size_t param_length;
+
+               /* validate searchparams1 */
+               param_length = searchblock.sizeofsearchparams1;
+               /* skip the word that specifies length of the buffer */
+               start_length= (u_int32_t*) searchparams1;
+               start_length= start_length+1;
+               string_ref= (attrreference_t*) start_length;
+
+               /* ensure no negative offsets or too big offsets */
+               if (string_ref->attr_dataoffset < 0 ) {
+                       error = EINVAL;
+                       goto freeandexit;
+               }
+               if (string_ref->attr_length > MAXPATHLEN) {
+                       error = EINVAL;
+                       goto freeandexit;
+               }
+
+               /* Check for pointer overflow in the string ref */
+               if (((char*) string_ref + string_ref->attr_dataoffset) < (char*) string_ref) {
+                       error = EINVAL;
+                       goto freeandexit;
+               }
+
+               if (((char*) string_ref + string_ref->attr_dataoffset) > ((char*)searchparams1 + param_length)) {
+                       error = EINVAL;
+                       goto freeandexit;
+               }
+               if (((char*)string_ref + string_ref->attr_dataoffset + string_ref->attr_length) > ((char*)searchparams1 + param_length)) {
+                       error = EINVAL;
+                       goto freeandexit;
+               }
+       }
+
+       /* set up the uio structure which will contain the users return buffer */
+       auio = uio_createwithbuffer(1, 0, spacetype, UIO_READ, &uio_buf[0], sizeof(uio_buf));
+       uio_addiov(auio, searchblock.returnbuffer, searchblock.returnbuffersize);
+
+       nameiflags = 0;
+       if ((uap->options & FSOPT_NOFOLLOW) == 0) nameiflags |= FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_SEARCHFS, nameiflags | AUDITVNPATH1,
+              UIO_USERSPACE, uap->path, ctx);
+
+       error = namei(&nd);
+       if (error)
+               goto freeandexit;
+       vp = nd.ni_vp;
+       nameidone(&nd);
+
+       /*
+        * Switch to the root vnode for the volume
+        */
+       error = VFS_ROOT(vnode_mount(vp), &tvp, ctx);
+       vnode_put(vp);
+       if (error)
+               goto freeandexit;
+       vp = tvp;
+
+       /*
+        * If it's a union mount, the path lookup takes
+        * us to the top layer. But we may need to descend
+        * to a lower layer. For non-union mounts the layer
+        * is always zero.
+        */
+       for (i = 0; i < (int) state->ss_union_layer; i++) {
+               if ((vp->v_mount->mnt_flag & MNT_UNION) == 0)
+                       break;
+               tvp = vp;
+               vp = vp->v_mount->mnt_vnodecovered;
+               if (vp == NULL) {
+                       vnode_put(tvp);
+                       error = ENOENT;
+                       goto freeandexit;
+               }
+               error = vnode_getwithref(vp);
+               vnode_put(tvp);
+               if (error)
+                       goto freeandexit;
+       }
+
+#if CONFIG_MACF
+       error = mac_vnode_check_searchfs(ctx, vp, &searchblock.searchattrs);
+       if (error) {
+               vnode_put(vp);
+               goto freeandexit;
+       }
+#endif
+
+
+       /*
+        * If searchblock.maxmatches == 0, then skip the search. This has happened
+        * before and sometimes the underlying code doesnt deal with it well.
+        */
+        if (searchblock.maxmatches == 0) {
+               nummatches = 0;
+               goto saveandexit;
+        }
+
+       /*
+        * Allright, we have everything we need, so lets make that call.
+        *
+        * We keep special track of the return value from the file system:
+        * EAGAIN is an acceptable error condition that shouldn't keep us
+        * from copying out any results...
+        */
+
+       fserror = VNOP_SEARCHFS(vp,
+               searchparams1,
+               searchparams2,
+               &searchblock.searchattrs,
+               (u_long)searchblock.maxmatches,
+               &timelimit,
+               returnattrs,
+               &nummatches,
+               (u_long)uap->scriptcode,
+               (u_long)uap->options,
+               auio,
+               (struct searchstate *) &state->ss_fsstate,
+               ctx);
+
+       /*
+        * If it's a union mount we need to be called again
+        * to search the mounted-on filesystem.
+        */
+       if ((vp->v_mount->mnt_flag & MNT_UNION) && fserror == 0) {
+               state->ss_union_flags = SRCHFS_START;
+               state->ss_union_layer++;        // search next layer down
+               fserror = EAGAIN;
+       }
+
+saveandexit:
+
+       vnode_put(vp);
+
+       /* Now copy out the stuff that needs copying out. That means the number of matches, the
+          search state.  Everything was already put into he return buffer by the vop call. */
+
+       if ((error = copyout((caddr_t) state, uap->state, sizeof(struct searchstate))) != 0)
+               goto freeandexit;
+
+       if ((error = suulong(uap->nummatches, (uint64_t)nummatches)) != 0)
+               goto freeandexit;
+
+       error = fserror;
+
+freeandexit:
+
+       FREE(searchparams1,M_TEMP);
+
+       return(error);
+
+
+} /* end of searchfs system call */
+
+#else /* CONFIG_SEARCHFS */
+
+int
+searchfs(__unused proc_t p, __unused struct searchfs_args *uap, __unused int32_t *retval)
+{
+       return (ENOTSUP);
+}
+
+#endif /* CONFIG_SEARCHFS */
+
+
+lck_grp_attr_t *  nspace_group_attr;
+lck_attr_t *      nspace_lock_attr;
+lck_grp_t *       nspace_mutex_group;
+
+lck_mtx_t         nspace_handler_lock;
+lck_mtx_t         nspace_handler_exclusion_lock;
+
+time_t snapshot_timestamp=0;
+int nspace_allow_virtual_devs=0;
+
+void nspace_handler_init(void);
+
+typedef struct nspace_item_info {
+       struct vnode *vp;
+       void         *arg;
+       uint64_t      op;
+       uint32_t      vid;
+       uint32_t      flags;
+       uint32_t      token;
+       uint32_t      refcount;
+} nspace_item_info;
+
+#define MAX_NSPACE_ITEMS   128
+nspace_item_info nspace_items[MAX_NSPACE_ITEMS];
+uint32_t      nspace_item_idx=0;              // also used as the sleep/wakeup rendezvous address
+uint32_t      nspace_token_id=0;
+uint32_t      nspace_handler_timeout = 15;    // seconds
+
+#define NSPACE_ITEM_NEW         0x0001
+#define NSPACE_ITEM_PROCESSING  0x0002
+#define NSPACE_ITEM_DEAD        0x0004
+#define NSPACE_ITEM_CANCELLED   0x0008
+#define NSPACE_ITEM_DONE        0x0010
+#define NSPACE_ITEM_RESET_TIMER 0x0020
+
+#define NSPACE_ITEM_NSPACE_EVENT   0x0040
+#define NSPACE_ITEM_SNAPSHOT_EVENT 0x0080
+
+#define NSPACE_ITEM_ALL_EVENT_TYPES (NSPACE_ITEM_NSPACE_EVENT | NSPACE_ITEM_SNAPSHOT_EVENT)
+
+//#pragma optimization_level 0
+
+typedef enum {
+       NSPACE_HANDLER_NSPACE = 0,
+       NSPACE_HANDLER_SNAPSHOT = 1,
+
+       NSPACE_HANDLER_COUNT,
+} nspace_type_t;
+
+typedef struct {
+       uint64_t handler_tid;
+       struct proc *handler_proc;
+       int handler_busy;
+} nspace_handler_t;
+
+nspace_handler_t nspace_handlers[NSPACE_HANDLER_COUNT];
+
+/* namespace fsctl functions */
+static int nspace_flags_matches_handler(uint32_t event_flags, nspace_type_t nspace_type);
+static int nspace_item_flags_for_type(nspace_type_t nspace_type);
+static int nspace_open_flags_for_type(nspace_type_t nspace_type);
+static nspace_type_t nspace_type_for_op(uint64_t op);
+static int nspace_is_special_process(struct proc *proc);
+static int vn_open_with_vp(vnode_t vp, int fmode, vfs_context_t ctx);
+static int wait_for_namespace_event(namespace_handler_data *nhd, nspace_type_t nspace_type);
+static int validate_namespace_args (int is64bit, int size);
+static int process_namespace_fsctl(nspace_type_t nspace_type, int is64bit, u_int size, caddr_t data);
+
+
+static inline int nspace_flags_matches_handler(uint32_t event_flags, nspace_type_t nspace_type)
+{
+       switch(nspace_type) {
+               case NSPACE_HANDLER_NSPACE:
+                       return (event_flags & NSPACE_ITEM_ALL_EVENT_TYPES) == NSPACE_ITEM_NSPACE_EVENT;
+               case NSPACE_HANDLER_SNAPSHOT:
+                       return (event_flags & NSPACE_ITEM_ALL_EVENT_TYPES) == NSPACE_ITEM_SNAPSHOT_EVENT;
+               default:
+                       printf("nspace_flags_matches_handler: invalid type %u\n", (int)nspace_type);
+                       return 0;
+       }
+}
+
+static inline int nspace_item_flags_for_type(nspace_type_t nspace_type)
+{
+       switch(nspace_type) {
+               case NSPACE_HANDLER_NSPACE:
+                       return NSPACE_ITEM_NSPACE_EVENT;
+               case NSPACE_HANDLER_SNAPSHOT:
+                       return NSPACE_ITEM_SNAPSHOT_EVENT;
+               default:
+                       printf("nspace_item_flags_for_type: invalid type %u\n", (int)nspace_type);
+                       return 0;
+       }
+}
+
+static inline int nspace_open_flags_for_type(nspace_type_t nspace_type)
+{
+       switch(nspace_type) {
+               case NSPACE_HANDLER_NSPACE:
+                       return FREAD | FWRITE | O_EVTONLY;
+               case NSPACE_HANDLER_SNAPSHOT:
+                       return FREAD | O_EVTONLY;
+               default:
+                       printf("nspace_open_flags_for_type: invalid type %u\n", (int)nspace_type);
+                       return 0;
+       }
+}
+
+static inline nspace_type_t nspace_type_for_op(uint64_t op)
+{
+       switch(op & NAMESPACE_HANDLER_EVENT_TYPE_MASK) {
+               case NAMESPACE_HANDLER_NSPACE_EVENT:
+                       return NSPACE_HANDLER_NSPACE;
+               case NAMESPACE_HANDLER_SNAPSHOT_EVENT:
+                       return NSPACE_HANDLER_SNAPSHOT;
+               default:
+                       printf("nspace_type_for_op: invalid op mask %llx\n", op & NAMESPACE_HANDLER_EVENT_TYPE_MASK);
+                       return NSPACE_HANDLER_NSPACE;
+       }
+}
+
+static inline int nspace_is_special_process(struct proc *proc)
+{
+       int i;
+       for (i = 0; i < NSPACE_HANDLER_COUNT; i++) {
+               if (proc == nspace_handlers[i].handler_proc)
+                       return 1;
+       }
+       return 0;
+}
+
+void
+nspace_handler_init(void)
+{
+       nspace_lock_attr    = lck_attr_alloc_init();
+       nspace_group_attr   = lck_grp_attr_alloc_init();
+       nspace_mutex_group  = lck_grp_alloc_init("nspace-mutex", nspace_group_attr);
+       lck_mtx_init(&nspace_handler_lock, nspace_mutex_group, nspace_lock_attr);
+       lck_mtx_init(&nspace_handler_exclusion_lock, nspace_mutex_group, nspace_lock_attr);
+       memset(&nspace_items[0], 0, sizeof(nspace_items));
+}
+
+void
+nspace_proc_exit(struct proc *p)
+{
+       int i, event_mask = 0;
+
+       for (i = 0; i < NSPACE_HANDLER_COUNT; i++) {
+               if (p == nspace_handlers[i].handler_proc) {
+                       event_mask |= nspace_item_flags_for_type(i);
+                       nspace_handlers[i].handler_tid = 0;
+                       nspace_handlers[i].handler_proc = NULL;
+               }
+       }
+
+       if (event_mask == 0) {
+               return;
+       }
+
+       lck_mtx_lock(&nspace_handler_lock);
+       if (event_mask & NSPACE_ITEM_SNAPSHOT_EVENT) {
+               // if this process was the snapshot handler, zero snapshot_timeout
+               snapshot_timestamp = 0;
+       }
+
+       //
+       // unblock anyone that's waiting for the handler that died
+       //
+       for(i=0; i < MAX_NSPACE_ITEMS; i++) {
+               if (nspace_items[i].flags & (NSPACE_ITEM_NEW | NSPACE_ITEM_PROCESSING)) {
+
+                       if ( nspace_items[i].flags & event_mask ) {
+
+                               if (nspace_items[i].vp && (nspace_items[i].vp->v_flag & VNEEDSSNAPSHOT)) {
+                                       vnode_lock_spin(nspace_items[i].vp);
+                                       nspace_items[i].vp->v_flag &= ~VNEEDSSNAPSHOT;
+                                       vnode_unlock(nspace_items[i].vp);
+                               }
+                               nspace_items[i].vp = NULL;
+                               nspace_items[i].vid = 0;
+                               nspace_items[i].flags = NSPACE_ITEM_DONE;
+                               nspace_items[i].token = 0;
+
+                               wakeup((caddr_t)&(nspace_items[i].vp));
+                       }
+               }
+       }
+
+       wakeup((caddr_t)&nspace_item_idx);
+       lck_mtx_unlock(&nspace_handler_lock);
+}
+
+
+int
+resolve_nspace_item(struct vnode *vp, uint64_t op)
+{
+       return resolve_nspace_item_ext(vp, op, NULL);
+}
+
+int
+resolve_nspace_item_ext(struct vnode *vp, uint64_t op, void *arg)
+{
+       int i, error, keep_waiting;
+       struct timespec ts;
+       nspace_type_t nspace_type = nspace_type_for_op(op);
+
+       // only allow namespace events on regular files, directories and symlinks.
+       if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK) {
+               return 0;
+       }
+
+       //
+       // if this is a snapshot event and the vnode is on a
+       // disk image just pretend nothing happened since any
+       // change to the disk image will cause the disk image
+       // itself to get backed up and this avoids multi-way
+       // deadlocks between the snapshot handler and the ever
+       // popular diskimages-helper process.  the variable
+       // nspace_allow_virtual_devs allows this behavior to
+       // be overridden (for use by the Mobile TimeMachine
+       // testing infrastructure which uses disk images)
+       //
+       if (   (op & NAMESPACE_HANDLER_SNAPSHOT_EVENT)
+           && (vp->v_mount != NULL)
+           && (vp->v_mount->mnt_kern_flag & MNTK_VIRTUALDEV)
+           && !nspace_allow_virtual_devs) {
+
+               return 0;
+       }
+
+       // if (thread_tid(current_thread()) == namespace_handler_tid) {
+       if (nspace_handlers[nspace_type].handler_proc == NULL) {
+               return 0;
+       }
+
+       if (nspace_is_special_process(current_proc())) {
+               return EDEADLK;
+       }
+
+       lck_mtx_lock(&nspace_handler_lock);
+
+retry:
+       for(i=0; i < MAX_NSPACE_ITEMS; i++) {
+               if (vp == nspace_items[i].vp && op == nspace_items[i].op) {
+                       break;
+               }
+       }
+
+       if (i >= MAX_NSPACE_ITEMS) {
+               for(i=0; i < MAX_NSPACE_ITEMS; i++) {
+                       if (nspace_items[i].flags == 0) {
+                               break;
+                       }
+               }
+       } else {
+               nspace_items[i].refcount++;
+       }
+
+       if (i >= MAX_NSPACE_ITEMS) {
+               ts.tv_sec = nspace_handler_timeout;
+               ts.tv_nsec = 0;
+
+               error = msleep((caddr_t)&nspace_token_id, &nspace_handler_lock, PVFS|PCATCH, "nspace-no-space", &ts);
+               if (error == 0) {
+                       // an entry got free'd up, go see if we can get a slot
+                       goto retry;
+               } else {
+                       lck_mtx_unlock(&nspace_handler_lock);
+                       return error;
+               }
+       }
+
+       //
+       // if it didn't already exist, add it.  if it did exist
+       // we'll get woken up when someone does a wakeup() on
+       // the slot in the nspace_items table.
+       //
+       if (vp != nspace_items[i].vp) {
+               nspace_items[i].vp = vp;
+               nspace_items[i].arg = (arg == NSPACE_REARM_NO_ARG) ? NULL : arg;  // arg is {NULL, true, uio *} - only pass uio thru to the user
+               nspace_items[i].op = op;
+               nspace_items[i].vid = vnode_vid(vp);
+               nspace_items[i].flags = NSPACE_ITEM_NEW;
+               nspace_items[i].flags |= nspace_item_flags_for_type(nspace_type);
+               if (nspace_items[i].flags & NSPACE_ITEM_SNAPSHOT_EVENT) {
+                       if (arg) {
+                               vnode_lock_spin(vp);
+                               vp->v_flag |= VNEEDSSNAPSHOT;
+                               vnode_unlock(vp);
+                       }
+               }
+
+               nspace_items[i].token = 0;
+               nspace_items[i].refcount = 1;
+
+               wakeup((caddr_t)&nspace_item_idx);
+       }
+
+       //
+       // Now go to sleep until the handler does a wakeup on this
+       // slot in the nspace_items table (or we timeout).
+       //
+       keep_waiting = 1;
+       while(keep_waiting) {
+               ts.tv_sec = nspace_handler_timeout;
+               ts.tv_nsec = 0;
+               error = msleep((caddr_t)&(nspace_items[i].vp), &nspace_handler_lock, PVFS|PCATCH, "namespace-done", &ts);
+
+               if (nspace_items[i].flags & NSPACE_ITEM_DONE) {
+                       error = 0;
+               } else if (nspace_items[i].flags & NSPACE_ITEM_CANCELLED) {
+                       error = nspace_items[i].token;
+               } else if (error == EWOULDBLOCK || error == ETIMEDOUT) {
+                       if (nspace_items[i].flags & NSPACE_ITEM_RESET_TIMER) {
+                               nspace_items[i].flags &= ~NSPACE_ITEM_RESET_TIMER;
+                               continue;
+                       } else {
+                               error = ETIMEDOUT;
+                       }
+               } else if (error == 0) {
+                       // hmmm, why did we get woken up?
+                       printf("woken up for token %d but it's not done, cancelled or timedout and error == 0.\n",
+                              nspace_items[i].token);
+               }
+
+               if (--nspace_items[i].refcount == 0) {
+                       nspace_items[i].vp = NULL;     // clear this so that no one will match on it again
+                       nspace_items[i].arg = NULL;
+                       nspace_items[i].token = 0;     // clear this so that the handler will not find it anymore
+                       nspace_items[i].flags = 0;     // this clears it for re-use
+               }
+               wakeup(&nspace_token_id);
+               keep_waiting = 0;
+       }
+
+       lck_mtx_unlock(&nspace_handler_lock);
+
+       return error;
+}
+
+int nspace_snapshot_event(vnode_t vp, time_t ctime, uint64_t op_type, void *arg)
+{
+       int snapshot_error = 0;
+
+       if (vp == NULL) {
+               return 0;
+       }
+
+       /* Swap files are special; skip them */
+       if (vnode_isswap(vp)) {
+               return 0;
+       }
+
+       if (ctime != 0 && snapshot_timestamp != 0 && (ctime <= snapshot_timestamp || vnode_needssnapshots(vp))) {
+               // the change time is within this epoch
+               int error;
+
+               error = resolve_nspace_item_ext(vp, op_type | NAMESPACE_HANDLER_SNAPSHOT_EVENT, arg);
+               if (error == EDEADLK) {
+                       snapshot_error = 0;
+               } else if (error) {
+                       if (error == EAGAIN) {
+                               printf("nspace_snapshot_event: timed out waiting for namespace handler...\n");
+                       } else if (error == EINTR) {
+                               // printf("nspace_snapshot_event: got a signal while waiting for namespace handler...\n");
+                               snapshot_error = EINTR;
+                       }
+               }
+       }
+
+       return snapshot_error;
+}
+
+int
+get_nspace_item_status(struct vnode *vp, int32_t *status)
+{
+       int i;
+
+       lck_mtx_lock(&nspace_handler_lock);
+       for(i=0; i < MAX_NSPACE_ITEMS; i++) {
+               if (nspace_items[i].vp == vp) {
+                       break;
+               }
+       }
+
+       if (i >= MAX_NSPACE_ITEMS) {
+               lck_mtx_unlock(&nspace_handler_lock);
+               return ENOENT;
+       }
+
+       *status = nspace_items[i].flags;
+       lck_mtx_unlock(&nspace_handler_lock);
+       return 0;
+}
+
+
+#if 0
+static int
+build_volfs_path(struct vnode *vp, char *path, int *len)
+{
+       struct vnode_attr va;
+       int ret;
+
+       VATTR_INIT(&va);
+       VATTR_WANTED(&va, va_fsid);
+       VATTR_WANTED(&va, va_fileid);
+
+       if (vnode_getattr(vp, &va, vfs_context_kernel()) != 0) {
+               *len = snprintf(path, *len, "/non/existent/path/because/vnode_getattr/failed") + 1;
+               ret = -1;
+       } else {
+               *len = snprintf(path, *len, "/.vol/%d/%lld", (dev_t)va.va_fsid, va.va_fileid) + 1;
+               ret = 0;
+       }
+
+       return ret;
+}
+#endif
+
+//
+// Note: this function does NOT check permissions on all of the
+// parent directories leading to this vnode.  It should only be
+// called on behalf of a root process.  Otherwise a process may
+// get access to a file because the file itself is readable even
+// though its parent directories would prevent access.
+//
+static int
+vn_open_with_vp(vnode_t vp, int fmode, vfs_context_t ctx)
+{
+       int error, action;
+
+       if ((error = suser(kauth_cred_get(), &(current_proc()->p_acflag)))) {
+               return error;
+       }
+
+#if CONFIG_MACF
+       error = mac_vnode_check_open(ctx, vp, fmode);
+       if (error)
+               return error;
+#endif
+
+       /* compute action to be authorized */
+       action = 0;
+       if (fmode & FREAD) {
+               action |= KAUTH_VNODE_READ_DATA;
+       }
+       if (fmode & (FWRITE | O_TRUNC)) {
+               /*
+                * If we are writing, appending, and not truncating,
+                * indicate that we are appending so that if the
+                * UF_APPEND or SF_APPEND bits are set, we do not deny
+                * the open.
+                */
+               if ((fmode & O_APPEND) && !(fmode & O_TRUNC)) {
+                       action |= KAUTH_VNODE_APPEND_DATA;
+               } else {
+                       action |= KAUTH_VNODE_WRITE_DATA;
+               }
+       }
+
+       if ((error = vnode_authorize(vp, NULL, action, ctx)) != 0)
+               return error;
+
+
+       //
+       // if the vnode is tagged VOPENEVT and the current process
+       // has the P_CHECKOPENEVT flag set, then we or in the O_EVTONLY
+       // flag to the open mode so that this open won't count against
+       // the vnode when carbon delete() does a vnode_isinuse() to see
+       // if a file is currently in use.  this allows spotlight
+       // importers to not interfere with carbon apps that depend on
+       // the no-delete-if-busy semantics of carbon delete().
+       //
+       if ((vp->v_flag & VOPENEVT) && (current_proc()->p_flag & P_CHECKOPENEVT)) {
+               fmode |= O_EVTONLY;
+       }
+
+       if ( (error = VNOP_OPEN(vp, fmode, ctx)) ) {
+               return error;
+       }
+       if ( (error = vnode_ref_ext(vp, fmode, 0)) ) {
+               VNOP_CLOSE(vp, fmode, ctx);
+               return error;
+       }
+
+       /* Call out to allow 3rd party notification of open.
+        * Ignore result of kauth_authorize_fileop call.
+        */
+#if CONFIG_MACF
+       mac_vnode_notify_open(ctx, vp, fmode);
+#endif
+       kauth_authorize_fileop(vfs_context_ucred(ctx), KAUTH_FILEOP_OPEN,
+                              (uintptr_t)vp, 0);
+
+
+       return 0;
+}
+
+static int
+wait_for_namespace_event(namespace_handler_data *nhd, nspace_type_t nspace_type)
+{
+       int i;
+       int error = 0;
+       int unblock = 0;
+       task_t curtask;
+
+       lck_mtx_lock(&nspace_handler_exclusion_lock);
+       if (nspace_handlers[nspace_type].handler_busy) {
+               lck_mtx_unlock(&nspace_handler_exclusion_lock);
+               return EBUSY;
+       }
+
+       nspace_handlers[nspace_type].handler_busy = 1;
+       lck_mtx_unlock(&nspace_handler_exclusion_lock);
+
+       /*
+        * Any process that gets here will be one of the namespace handlers.
+        * As such, they should be prevented from acquiring DMG vnodes during vnode reclamation
+        * as we can cause deadlocks to occur, because the namespace handler may prevent
+        * VNOP_INACTIVE from proceeding.  Mark the current task as a P_DEPENDENCY_CAPABLE
+        * process.
+        */
+       curtask = current_task();
+       bsd_set_dependency_capable (curtask);
+
+       lck_mtx_lock(&nspace_handler_lock);
+       if (nspace_handlers[nspace_type].handler_proc == NULL) {
+               nspace_handlers[nspace_type].handler_tid = thread_tid(current_thread());
+               nspace_handlers[nspace_type].handler_proc = current_proc();
+       }
+
+       if (nspace_type == NSPACE_HANDLER_SNAPSHOT &&
+                       (snapshot_timestamp == 0 || snapshot_timestamp == ~0)) {
+               error = EINVAL;
+       }
+
+       while (error == 0) {
+
+               /* Try to find matching namespace item */
+               for (i = 0; i < MAX_NSPACE_ITEMS; i++) {
+                       if (nspace_items[i].flags & NSPACE_ITEM_NEW) {
+                               if (nspace_flags_matches_handler(nspace_items[i].flags, nspace_type)) {
+                                       break;
+                               }
+                       }
+               }
+
+               if (i >= MAX_NSPACE_ITEMS) {
+                       /* Nothing is there yet. Wait for wake up and retry */
+                       error = msleep((caddr_t)&nspace_item_idx, &nspace_handler_lock, PVFS|PCATCH, "namespace-items", 0);
+                       if ((nspace_type == NSPACE_HANDLER_SNAPSHOT) && (snapshot_timestamp == 0 || snapshot_timestamp == ~0)) {
+                               /* Prevent infinite loop if snapshot handler exited */
+                               error = EINVAL;
+                               break;
+                       }
+                       continue;
+               }
+
+               nspace_items[i].flags  &= ~NSPACE_ITEM_NEW;
+               nspace_items[i].flags  |= NSPACE_ITEM_PROCESSING;
+               nspace_items[i].token  = ++nspace_token_id;
+
+               assert(nspace_items[i].vp);
+               struct fileproc *fp;
+               int32_t indx;
+               int32_t fmode;
+               struct proc *p = current_proc();
+               vfs_context_t ctx = vfs_context_current();
+               struct vnode_attr va;
+               bool vn_get_succsessful = false;
+               bool vn_open_successful = false;
+               bool fp_alloc_successful = false;
+
+               /*
+                * Use vnode pointer to acquire a file descriptor for
+                * hand-off to userland
+                */
+               fmode = nspace_open_flags_for_type(nspace_type);
+               error = vnode_getwithvid(nspace_items[i].vp, nspace_items[i].vid);
+               if (error) goto cleanup;
+               vn_get_succsessful = true;
+
+               error = vn_open_with_vp(nspace_items[i].vp, fmode, ctx);
+               if (error) goto cleanup;
+               vn_open_successful = true;
+
+               error = falloc(p, &fp, &indx, ctx);
+               if (error) goto cleanup;
+               fp_alloc_successful = true;
+
+               fp->f_fglob->fg_flag = fmode;
+               fp->f_fglob->fg_ops = &vnops;
+               fp->f_fglob->fg_data = (caddr_t)nspace_items[i].vp;
+
+               proc_fdlock(p);
+               procfdtbl_releasefd(p, indx, NULL);
+               fp_drop(p, indx, fp, 1);
+               proc_fdunlock(p);
+
+               /*
+                * All variants of the namespace handler struct support these three fields:
+                * token, flags, and the FD pointer
+                */
+               error = copyout(&nspace_items[i].token, nhd->token, sizeof(uint32_t));
+               if (error) goto cleanup;
+               error = copyout(&nspace_items[i].op, nhd->flags, sizeof(uint64_t));
+               if (error) goto cleanup;
+               error = copyout(&indx, nhd->fdptr, sizeof(uint32_t));
+               if (error) goto cleanup;
+
+               /*
+                * Handle optional fields:
+                * extended version support an info ptr (offset, length), and the
+                *
+                * namedata version supports a unique per-link object ID
+                *
+                */
+               if (nhd->infoptr) {
+                       uio_t uio = (uio_t)nspace_items[i].arg;
+                       uint64_t u_offset, u_length;
+
+                       if (uio) {
+                               u_offset = uio_offset(uio);
+                               u_length = uio_resid(uio);
+                       } else {
+                               u_offset = 0;
+                               u_length = 0;
+                       }
+                       error = copyout(&u_offset, nhd->infoptr, sizeof(uint64_t));
+                       if (error) goto cleanup;
+                       error = copyout(&u_length, nhd->infoptr + sizeof(uint64_t), sizeof(uint64_t));
+                       if (error) goto cleanup;
+               }
+
+               if (nhd->objid) {
+                       VATTR_INIT(&va);
+                       VATTR_WANTED(&va, va_linkid);
+                       error = vnode_getattr(nspace_items[i].vp, &va, ctx);
+                       if (error) goto cleanup;
+
+                       uint64_t linkid = 0;
+                       if (VATTR_IS_SUPPORTED (&va, va_linkid)) {
+                               linkid = (uint64_t)va.va_linkid;
+                       }
+                       error = copyout(&linkid, nhd->objid, sizeof(uint64_t));
+               }
+cleanup:
+               if (error) {
+                       if (fp_alloc_successful) fp_free(p, indx, fp);
+                       if (vn_open_successful) vn_close(nspace_items[i].vp, fmode, ctx);
+                       unblock = 1;
+               }
+
+               if (vn_get_succsessful) vnode_put(nspace_items[i].vp);
+
+               break;
+       }
+
+       if (unblock) {
+               if (nspace_items[i].vp && (nspace_items[i].vp->v_flag & VNEEDSSNAPSHOT)) {
+                       vnode_lock_spin(nspace_items[i].vp);
+                       nspace_items[i].vp->v_flag &= ~VNEEDSSNAPSHOT;
+                       vnode_unlock(nspace_items[i].vp);
+               }
+               nspace_items[i].vp = NULL;
+               nspace_items[i].vid = 0;
+               nspace_items[i].flags = NSPACE_ITEM_DONE;
+               nspace_items[i].token = 0;
+
+               wakeup((caddr_t)&(nspace_items[i].vp));
+       }
+
+       if (nspace_type == NSPACE_HANDLER_SNAPSHOT) {
+               // just go through every snapshot event and unblock it immediately.
+               if (error && (snapshot_timestamp == 0 || snapshot_timestamp == ~0)) {
+                       for(i = 0; i < MAX_NSPACE_ITEMS; i++) {
+                               if (nspace_items[i].flags & NSPACE_ITEM_NEW) {
+                                       if (nspace_flags_matches_handler(nspace_items[i].flags, nspace_type)) {
+                                               nspace_items[i].vp = NULL;
+                                               nspace_items[i].vid = 0;
+                                               nspace_items[i].flags = NSPACE_ITEM_DONE;
+                                               nspace_items[i].token = 0;
+
+                                               wakeup((caddr_t)&(nspace_items[i].vp));
+                                       }
+                               }
+                       }
+               }
+       }
+
+       lck_mtx_unlock(&nspace_handler_lock);
+
+       lck_mtx_lock(&nspace_handler_exclusion_lock);
+       nspace_handlers[nspace_type].handler_busy = 0;
+       lck_mtx_unlock(&nspace_handler_exclusion_lock);
+
+       return error;
+}
+
+static inline int validate_namespace_args (int is64bit, int size) {
+
+       if (is64bit) {
+               /* Must be one of these */
+               if (size == sizeof(user64_namespace_handler_info)) {
+                       goto sizeok;
+               }
+               if (size == sizeof(user64_namespace_handler_info_ext)) {
+                       goto sizeok;
+               }
+               if (size == sizeof(user64_namespace_handler_data)) {
+                       goto sizeok;
+               }
+               return EINVAL;
+       }
+       else {
+               /* 32 bit -- must be one of these */
+               if (size == sizeof(user32_namespace_handler_info)) {
+                       goto sizeok;
+               }
+               if (size == sizeof(user32_namespace_handler_info_ext)) {
+                       goto sizeok;
+               }
+               if (size == sizeof(user32_namespace_handler_data)) {
+                       goto sizeok;
+               }
+               return EINVAL;
+       }
+
+sizeok:
+
+       return 0;
+
+}
+
+static int process_namespace_fsctl(nspace_type_t nspace_type, int is64bit, u_int size, caddr_t data)
+{
+       int error = 0;
+       namespace_handler_data nhd;
+
+       bzero (&nhd, sizeof(namespace_handler_data));
+
+       if ((error = suser(kauth_cred_get(), &(current_proc()->p_acflag)))) {
+               return error;
+       }
+
+       error = validate_namespace_args (is64bit, size);
+       if (error) {
+               return error;
+       }
+
+       /* Copy in the userland pointers into our kernel-only struct */
+
+       if (is64bit) {
+               /* 64 bit userland structures */
+               nhd.token = (user_addr_t)((user64_namespace_handler_info *)data)->token;
+               nhd.flags = (user_addr_t)((user64_namespace_handler_info *)data)->flags;
+               nhd.fdptr = (user_addr_t)((user64_namespace_handler_info *)data)->fdptr;
+
+               /* If the size is greater than the standard info struct, add in extra fields */
+               if (size > (sizeof(user64_namespace_handler_info))) {
+                       if (size >= (sizeof(user64_namespace_handler_info_ext))) {
+                               nhd.infoptr = (user_addr_t)((user64_namespace_handler_info_ext *)data)->infoptr;
+                       }
+                       if (size == (sizeof(user64_namespace_handler_data))) {
+                               nhd.objid = (user_addr_t)((user64_namespace_handler_data*)data)->objid;
+                       }
+                       /* Otherwise the fields were pre-zeroed when we did the bzero above. */
+               }
+       }
+       else {
+               /* 32 bit userland structures */
+               nhd.token = CAST_USER_ADDR_T(((user32_namespace_handler_info *)data)->token);
+               nhd.flags = CAST_USER_ADDR_T(((user32_namespace_handler_info *)data)->flags);
+               nhd.fdptr = CAST_USER_ADDR_T(((user32_namespace_handler_info *)data)->fdptr);
+
+               if (size > (sizeof(user32_namespace_handler_info))) {
+                       if (size >= (sizeof(user32_namespace_handler_info_ext))) {
+                               nhd.infoptr = CAST_USER_ADDR_T(((user32_namespace_handler_info_ext *)data)->infoptr);
+                       }
+                       if (size == (sizeof(user32_namespace_handler_data))) {
+                               nhd.objid = (user_addr_t)((user32_namespace_handler_data*)data)->objid;
+                       }
+                       /* Otherwise the fields were pre-zeroed when we did the bzero above. */
+               }
+       }
+
+       return wait_for_namespace_event(&nhd, nspace_type);
+}
+
+static unsigned long
+fsctl_bogus_command_compat(unsigned long cmd)
+{
+
+       switch (cmd) {
+       case IOCBASECMD(FSIOC_SYNC_VOLUME):
+               return (FSIOC_SYNC_VOLUME);
+       case IOCBASECMD(FSIOC_ROUTEFS_SETROUTEID):
+               return (FSIOC_ROUTEFS_SETROUTEID);
+       case IOCBASECMD(FSIOC_SET_PACKAGE_EXTS):
+               return (FSIOC_SET_PACKAGE_EXTS);
+       case IOCBASECMD(FSIOC_NAMESPACE_HANDLER_GET):
+               return (FSIOC_NAMESPACE_HANDLER_GET);
+       case IOCBASECMD(FSIOC_OLD_SNAPSHOT_HANDLER_GET):
+               return (FSIOC_OLD_SNAPSHOT_HANDLER_GET);
+       case IOCBASECMD(FSIOC_SNAPSHOT_HANDLER_GET_EXT):
+               return (FSIOC_SNAPSHOT_HANDLER_GET_EXT);
+       case IOCBASECMD(FSIOC_NAMESPACE_HANDLER_UPDATE):
+               return (FSIOC_NAMESPACE_HANDLER_UPDATE);
+       case IOCBASECMD(FSIOC_NAMESPACE_HANDLER_UNBLOCK):
+               return (FSIOC_NAMESPACE_HANDLER_UNBLOCK);
+       case IOCBASECMD(FSIOC_NAMESPACE_HANDLER_CANCEL):
+               return (FSIOC_NAMESPACE_HANDLER_CANCEL);
+       case IOCBASECMD(FSIOC_NAMESPACE_HANDLER_SET_SNAPSHOT_TIME):
+               return (FSIOC_NAMESPACE_HANDLER_SET_SNAPSHOT_TIME);
+       case IOCBASECMD(FSIOC_NAMESPACE_ALLOW_DMG_SNAPSHOT_EVENTS):
+               return (FSIOC_NAMESPACE_ALLOW_DMG_SNAPSHOT_EVENTS);
+       case IOCBASECMD(FSIOC_SET_FSTYPENAME_OVERRIDE):
+               return (FSIOC_SET_FSTYPENAME_OVERRIDE);
+       case IOCBASECMD(DISK_CONDITIONER_IOC_GET):
+               return (DISK_CONDITIONER_IOC_GET);
+       case IOCBASECMD(DISK_CONDITIONER_IOC_SET):
+               return (DISK_CONDITIONER_IOC_SET);
+       case IOCBASECMD(FSIOC_FIOSEEKHOLE):
+               return (FSIOC_FIOSEEKHOLE);
+       case IOCBASECMD(FSIOC_FIOSEEKDATA):
+               return (FSIOC_FIOSEEKDATA);
+       case IOCBASECMD(SPOTLIGHT_IOC_GET_MOUNT_TIME):
+               return (SPOTLIGHT_IOC_GET_MOUNT_TIME);
+       case IOCBASECMD(SPOTLIGHT_IOC_GET_LAST_MTIME):
+               return (SPOTLIGHT_IOC_GET_LAST_MTIME);
+       }
+
+       return (cmd);
+}
+
+/*
+ * Make a filesystem-specific control call:
+ */
+/* ARGSUSED */
+static int
+fsctl_internal(proc_t p, vnode_t *arg_vp, u_long cmd, user_addr_t udata, u_long options, vfs_context_t ctx)
+{
+       int error=0;
+       boolean_t is64bit;
+       u_int size;
+#define STK_PARAMS 128
+       char stkbuf[STK_PARAMS] = {0};
+       caddr_t data, memp;
+       vnode_t vp = *arg_vp;
+
+       cmd = fsctl_bogus_command_compat(cmd);
+
+       size = IOCPARM_LEN(cmd);
+       if (size > IOCPARM_MAX) return (EINVAL);
+
+       is64bit = proc_is64bit(p);
+
+       memp = NULL;
+
+       if (size > sizeof (stkbuf)) {
+               if ((memp = (caddr_t)kalloc(size)) == 0) return ENOMEM;
+               data = memp;
+       } else {
+               data = &stkbuf[0];
+       };
+
+       if (cmd & IOC_IN) {
+               if (size) {
+                       error = copyin(udata, data, size);
+                       if (error) {
+                               if (memp) {
+                                       kfree (memp, size);
+                               }
+                               return error;
+                       }
+               } else {
+                       if (is64bit) {
+                               *(user_addr_t *)data = udata;
+                       }
+                       else {
+                               *(uint32_t *)data = (uint32_t)udata;
+                       }
+               };
+       } else if ((cmd & IOC_OUT) && size) {
+               /*
+                * Zero the buffer so the user always
+                * gets back something deterministic.
+                */
+               bzero(data, size);
+       } else if (cmd & IOC_VOID) {
+               if (is64bit) {
+                       *(user_addr_t *)data = udata;
+               }
+               else {
+                       *(uint32_t *)data = (uint32_t)udata;
+               }
+       }
+
+       /* Check to see if it's a generic command */
+       switch (cmd) {
+
+               case FSIOC_SYNC_VOLUME: {
+                       mount_t mp = vp->v_mount;
+                       int arg = *(uint32_t*)data;
+
+                       /* record vid of vp so we can drop it below. */
+                       uint32_t vvid = vp->v_id;
+
+                       /*
+                        * Then grab mount_iterref so that we can release the vnode.
+                        * Without this, a thread may call vnode_iterate_prepare then
+                        * get into a deadlock because we've never released the root vp
+                        */
+                       error = mount_iterref (mp, 0);
+                       if (error)  {
+                               break;
+                       }
+                       vnode_put(vp);
+
+                       /* issue the sync for this volume */
+                       (void)sync_callback(mp, (arg & FSCTL_SYNC_WAIT) ? &arg : NULL);
+
+                       /*
+                        * Then release the mount_iterref once we're done syncing; it's not
+                        * needed for the VNOP_IOCTL below
+                        */
+                       mount_iterdrop(mp);
+
+                       if (arg & FSCTL_SYNC_FULLSYNC) {
+                               /* re-obtain vnode iocount on the root vp, if possible */
+                               error = vnode_getwithvid (vp, vvid);
+                               if (error == 0) {
+                                       error = VNOP_IOCTL(vp, F_FULLFSYNC, (caddr_t)NULL, 0, ctx);
+                                       vnode_put (vp);
+                               }
+                       }
+                       /* mark the argument VP as having been released */
+                       *arg_vp = NULL;
+               }
+               break;
+
+               case FSIOC_ROUTEFS_SETROUTEID: {
+#if ROUTEFS
+                       char routepath[MAXPATHLEN];
+                       size_t len = 0;
+
+                       if ((error = suser(kauth_cred_get(), &(current_proc()->p_acflag)))) {
+                               break;
+                       }
+                       bzero(routepath, MAXPATHLEN);
+                       error = copyinstr(udata, &routepath[0], MAXPATHLEN, &len);
+                       if (error) {
+                               break;
+                       }
+                       error = routefs_kernel_mount(routepath);
+                       if (error) {
+                               break;
+                       }
+#endif
+               }
+               break;
+
+               case FSIOC_SET_PACKAGE_EXTS: {
+                       user_addr_t ext_strings;
+                       uint32_t    num_entries;
+                       uint32_t    max_width;
+
+                       if ((error = priv_check_cred(kauth_cred_get(), PRIV_PACKAGE_EXTENSIONS, 0)))
+                               break;
+
+                       if (   (is64bit && size != sizeof(user64_package_ext_info))
+                                       || (is64bit == 0 && size != sizeof(user32_package_ext_info))) {
+
+                               // either you're 64-bit and passed a 64-bit struct or
+                               // you're 32-bit and passed a 32-bit struct.  otherwise
+                               // it's not ok.
+                               error = EINVAL;
+                               break;
+                       }
+
+                       if (is64bit) {
+                               ext_strings = ((user64_package_ext_info *)data)->strings;
+                               num_entries = ((user64_package_ext_info *)data)->num_entries;
+                               max_width   = ((user64_package_ext_info *)data)->max_width;
+                       } else {
+                               ext_strings = CAST_USER_ADDR_T(((user32_package_ext_info *)data)->strings);
+                               num_entries = ((user32_package_ext_info *)data)->num_entries;
+                               max_width   = ((user32_package_ext_info *)data)->max_width;
+                       }
+                       error = set_package_extensions_table(ext_strings, num_entries, max_width);
+               }
+               break;
+
+               /* namespace handlers */
+               case FSIOC_NAMESPACE_HANDLER_GET: {
+                       error = process_namespace_fsctl(NSPACE_HANDLER_NSPACE, is64bit, size, data);
+               }
+               break;
+
+               /* Snapshot handlers */
+               case FSIOC_OLD_SNAPSHOT_HANDLER_GET: {
+                       error = process_namespace_fsctl(NSPACE_HANDLER_SNAPSHOT, is64bit, size, data);
+               }
+               break;
+
+               case FSIOC_SNAPSHOT_HANDLER_GET_EXT: {
+                       error = process_namespace_fsctl(NSPACE_HANDLER_SNAPSHOT, is64bit, size, data);
+               }
+               break;
+
+               case FSIOC_NAMESPACE_HANDLER_UPDATE: {
+                       uint32_t token, val;
+                       int i;
+
+                       if ((error = suser(kauth_cred_get(), &(p->p_acflag)))) {
+                               break;
+                       }
+
+                       if (!nspace_is_special_process(p)) {
+                               error = EINVAL;
+                               break;
+                       }
+
+                       token = ((uint32_t *)data)[0];
+                       val   = ((uint32_t *)data)[1];
+
+                       lck_mtx_lock(&nspace_handler_lock);
+
+                       for(i=0; i < MAX_NSPACE_ITEMS; i++) {
+                               if (nspace_items[i].token == token) {
+                                       break;  /* exit for loop, not case stmt */
+                               }
+                       }
+
+                       if (i >= MAX_NSPACE_ITEMS) {
+                               error = ENOENT;
+                       } else {
+                               //
+                               // if this bit is set, when resolve_nspace_item() times out
+                               // it will loop and go back to sleep.
+                               //
+                               nspace_items[i].flags |= NSPACE_ITEM_RESET_TIMER;
+                       }
+
+                       lck_mtx_unlock(&nspace_handler_lock);
+
+                       if (error) {
+                               printf("nspace-handler-update: did not find token %u\n", token);
+                       }
+               }
+               break;
+
+               case FSIOC_NAMESPACE_HANDLER_UNBLOCK: {
+                       uint32_t token, val;
+                       int i;
+
+                       if ((error = suser(kauth_cred_get(), &(p->p_acflag)))) {
+                               break;
+                       }
+
+                       if (!nspace_is_special_process(p)) {
+                               error = EINVAL;
+                               break;
+                       }
+
+                       token = ((uint32_t *)data)[0];
+                       val   = ((uint32_t *)data)[1];
+
+                       lck_mtx_lock(&nspace_handler_lock);
+
+                       for(i=0; i < MAX_NSPACE_ITEMS; i++) {
+                               if (nspace_items[i].token == token) {
+                                       break; /* exit for loop, not case statement */
+                               }
+                       }
+
+                       if (i >= MAX_NSPACE_ITEMS) {
+                               printf("nspace-handler-unblock: did not find token %u\n", token);
+                               error = ENOENT;
+                       } else {
+                               if (val == 0 && nspace_items[i].vp) {
+                                       vnode_lock_spin(nspace_items[i].vp);
+                                       nspace_items[i].vp->v_flag &= ~VNEEDSSNAPSHOT;
+                                       vnode_unlock(nspace_items[i].vp);
+                               }
+
+                               nspace_items[i].vp = NULL;
+                               nspace_items[i].arg = NULL;
+                               nspace_items[i].op = 0;
+                               nspace_items[i].vid = 0;
+                               nspace_items[i].flags = NSPACE_ITEM_DONE;
+                               nspace_items[i].token = 0;
+
+                               wakeup((caddr_t)&(nspace_items[i].vp));
+                       }
+
+                       lck_mtx_unlock(&nspace_handler_lock);
+               }
+               break;
+
+               case FSIOC_NAMESPACE_HANDLER_CANCEL: {
+                       uint32_t token, val;
+                       int i;
+
+                       if ((error = suser(kauth_cred_get(), &(p->p_acflag)))) {
+                               break;
+                       }
+
+                       if (!nspace_is_special_process(p)) {
+                               error = EINVAL;
+                               break;
+                       }
+
+                       token = ((uint32_t *)data)[0];
+                       val   = ((uint32_t *)data)[1];
+
+                       lck_mtx_lock(&nspace_handler_lock);
+
+                       for(i=0; i < MAX_NSPACE_ITEMS; i++) {
+                               if (nspace_items[i].token == token) {
+                                       break;  /* exit for loop, not case stmt */
+                               }
+                       }
+
+                       if (i >= MAX_NSPACE_ITEMS) {
+                               printf("nspace-handler-cancel: did not find token %u\n", token);
+                               error = ENOENT;
+                       } else {
+                               if (nspace_items[i].vp) {
+                                       vnode_lock_spin(nspace_items[i].vp);
+                                       nspace_items[i].vp->v_flag &= ~VNEEDSSNAPSHOT;
+                                       vnode_unlock(nspace_items[i].vp);
+                               }
+
+                               nspace_items[i].vp = NULL;
+                               nspace_items[i].arg = NULL;
+                               nspace_items[i].vid = 0;
+                               nspace_items[i].token = val;
+                               nspace_items[i].flags &= ~NSPACE_ITEM_PROCESSING;
+                               nspace_items[i].flags |= NSPACE_ITEM_CANCELLED;
+
+                               wakeup((caddr_t)&(nspace_items[i].vp));
+                       }
+
+                       lck_mtx_unlock(&nspace_handler_lock);
+               }
+               break;
+
+               case FSIOC_NAMESPACE_HANDLER_SET_SNAPSHOT_TIME: {
+                       if ((error = suser(kauth_cred_get(), &(current_proc()->p_acflag)))) {
+                               break;
+                       }
+
+                       // we explicitly do not do the namespace_handler_proc check here
+
+                       lck_mtx_lock(&nspace_handler_lock);
+                       snapshot_timestamp = ((uint32_t *)data)[0];
+                       wakeup(&nspace_item_idx);
+                       lck_mtx_unlock(&nspace_handler_lock);
+                       printf("nspace-handler-set-snapshot-time: %d\n", (int)snapshot_timestamp);
+
+               }
+               break;
+
+               case FSIOC_NAMESPACE_ALLOW_DMG_SNAPSHOT_EVENTS:
+               {
+                       if ((error = suser(kauth_cred_get(), &(current_proc()->p_acflag)))) {
+                               break;
+                       }
+
+                       lck_mtx_lock(&nspace_handler_lock);
+                       nspace_allow_virtual_devs = ((uint32_t *)data)[0];
+                       lck_mtx_unlock(&nspace_handler_lock);
+                       printf("nspace-snapshot-handler will%s allow events on disk-images\n",
+                                       nspace_allow_virtual_devs ? "" : " NOT");
+                       error = 0;
+
+               }
+               break;
+
+               case FSIOC_SET_FSTYPENAME_OVERRIDE:
+               {
+                       if ((error = suser(kauth_cred_get(), &(current_proc()->p_acflag)))) {
+                               break;
+                       }
+                       if (vp->v_mount) {
+                               mount_lock(vp->v_mount);
+                               if (data[0] != 0) {
+                                       strlcpy(&vp->v_mount->fstypename_override[0], data, MFSTYPENAMELEN);
+                                       vp->v_mount->mnt_kern_flag |= MNTK_TYPENAME_OVERRIDE;
+                                       if (vfs_isrdonly(vp->v_mount) && strcmp(vp->v_mount->fstypename_override, "mtmfs") == 0) {
+                                               vp->v_mount->mnt_kern_flag |= MNTK_EXTENDED_SECURITY;
+                                               vp->v_mount->mnt_kern_flag &= ~MNTK_AUTH_OPAQUE;
+                                       }
+                               } else {
+                                       if (strcmp(vp->v_mount->fstypename_override, "mtmfs") == 0) {
+                                               vp->v_mount->mnt_kern_flag &= ~MNTK_EXTENDED_SECURITY;
+                                       }
+                                       vp->v_mount->mnt_kern_flag &= ~MNTK_TYPENAME_OVERRIDE;
+                                       vp->v_mount->fstypename_override[0] = '\0';
+                               }
+                               mount_unlock(vp->v_mount);
+                       }
+               }
+               break;
+
+               case DISK_CONDITIONER_IOC_GET: {
+                 error = disk_conditioner_get_info(vp->v_mount, (disk_conditioner_info *)data);
+               }
+               break;
+
+               case DISK_CONDITIONER_IOC_SET: {
+                 error = disk_conditioner_set_info(vp->v_mount, (disk_conditioner_info *)data);
+               }
+               break;
+
+               default: {
+                       /* other, known commands shouldn't be passed down here */
+                       switch (cmd) {
+                               case F_PUNCHHOLE:
+                               case F_TRIM_ACTIVE_FILE:
+                               case F_RDADVISE:
+                               case F_TRANSCODEKEY:
+                               case F_GETPROTECTIONLEVEL:
+                               case F_GETDEFAULTPROTLEVEL:
+                               case F_MAKECOMPRESSED:
+                               case F_SET_GREEDY_MODE:
+                               case F_SETSTATICCONTENT:
+                               case F_SETIOTYPE:
+                               case F_SETBACKINGSTORE:
+                               case F_GETPATH_MTMINFO:
+                               case APFSIOC_REVERT_TO_SNAPSHOT:
+                               case FSIOC_FIOSEEKHOLE:
+                               case FSIOC_FIOSEEKDATA:
+                               case HFS_GET_BOOT_INFO:
+                               case HFS_SET_BOOT_INFO:
+                               case FIOPINSWAP:
+                               case F_CHKCLEAN:
+                               case F_FULLFSYNC:
+                               case F_BARRIERFSYNC:
+                               case F_FREEZE_FS:
+                               case F_THAW_FS:
+                                       error = EINVAL;
+                                       goto outdrop;
+                       }
+                       /* Invoke the filesystem-specific code */
+                       error = VNOP_IOCTL(vp, cmd, data, options, ctx);
+               }
+
+       } /* end switch stmt */
+
+       /*
+        * if no errors, copy any data to user. Size was
+        * already set and checked above.
+        */
+       if (error == 0 && (cmd & IOC_OUT) && size)
+               error = copyout(data, udata, size);
+
+outdrop:
+       if (memp) {
+               kfree(memp, size);
+       }
+
+       return error;
+}
+
+/* ARGSUSED */
+int
+fsctl (proc_t p, struct fsctl_args *uap, __unused int32_t *retval)
+{
+       int error;
+       struct nameidata nd;
+       u_long nameiflags;
+       vnode_t vp = NULL;
+       vfs_context_t ctx = vfs_context_current();
+
+       AUDIT_ARG(cmd, uap->cmd);
+       AUDIT_ARG(value32, uap->options);
+       /* Get the vnode for the file we are getting info on:  */
+       nameiflags = 0;
+       if ((uap->options & FSOPT_NOFOLLOW) == 0) nameiflags |= FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_FSCTL, nameiflags | AUDITVNPATH1,
+              UIO_USERSPACE, uap->path, ctx);
+       if ((error = namei(&nd))) goto done;
+       vp = nd.ni_vp;
+       nameidone(&nd);
+
+#if CONFIG_MACF
+       error = mac_mount_check_fsctl(ctx, vnode_mount(vp), uap->cmd);
+       if (error) {
+               goto done;
+       }
+#endif
+
+       error = fsctl_internal(p, &vp, uap->cmd, (user_addr_t)uap->data, uap->options, ctx);
+
+done:
+       if (vp)
+               vnode_put(vp);
+       return error;
+}
+/* ARGSUSED */
+int
+ffsctl (proc_t p, struct ffsctl_args *uap, __unused int32_t *retval)
+{
+       int error;
+       vnode_t vp = NULL;
+       vfs_context_t ctx = vfs_context_current();
+       int fd = -1;
+
+       AUDIT_ARG(fd, uap->fd);
+       AUDIT_ARG(cmd, uap->cmd);
+       AUDIT_ARG(value32, uap->options);
+
+       /* Get the vnode for the file we are getting info on:  */
+       if ((error = file_vnode(uap->fd, &vp)))
+               return error;
+       fd = uap->fd;
+       if ((error = vnode_getwithref(vp))) {
+               file_drop(fd);
+               return error;
+       }
+
+#if CONFIG_MACF
+       if ((error = mac_mount_check_fsctl(ctx, vnode_mount(vp), uap->cmd))) {
+               file_drop(fd);
+               vnode_put(vp);
+               return error;
+       }
+#endif
+
+       error = fsctl_internal(p, &vp, uap->cmd, (user_addr_t)uap->data, uap->options, ctx);
+
+       file_drop(fd);
+
+       /*validate vp; fsctl_internal() can drop iocount and reset vp to NULL*/
+       if (vp) {
+               vnode_put(vp);
+       }
+
+       return error;
+}
+/* end of fsctl system call */
+
+/*
+ *  Retrieve the data of an extended attribute.
+ */
+int
+getxattr(proc_t p, struct getxattr_args *uap, user_ssize_t *retval)
+{
+       vnode_t vp;
+       struct nameidata nd;
+       char attrname[XATTR_MAXNAMELEN+1];
+       vfs_context_t ctx = vfs_context_current();
+       uio_t auio = NULL;
+       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       size_t attrsize = 0;
+       size_t namelen;
+       u_int32_t nameiflags;
+       int error;
+       char uio_buf[ UIO_SIZEOF(1) ];
+
+       if (uap->options & (XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_GETXATTR, nameiflags, spacetype, uap->path, ctx);
+       if ((error = namei(&nd))) {
+               return (error);
+       }
+       vp = nd.ni_vp;
+       nameidone(&nd);
+
+       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
+       if (error != 0) {
+               goto out;
+       }
+       if (xattr_protected(attrname)) {
+               if (!vfs_context_issuser(ctx) || strcmp(attrname, "com.apple.system.Security") != 0) {
+                       error = EPERM;
+                       goto out;
+               }
+       }
+       /*
+        * the specific check for 0xffffffff is a hack to preserve
+        * binaray compatibilty in K64 with applications that discovered
+        * that passing in a buf pointer and a size of -1 resulted in
+        * just the size of the indicated extended attribute being returned.
+        * this isn't part of the documented behavior, but because of the
+        * original implemtation's check for "uap->size > 0", this behavior
+        * was allowed. In K32 that check turned into a signed comparison
+        * even though uap->size is unsigned...  in K64, we blow by that
+        * check because uap->size is unsigned and doesn't get sign smeared
+        * in the munger for a 32 bit user app.  we also need to add a
+        * check to limit the maximum size of the buffer being passed in...
+        * unfortunately, the underlying fileystems seem to just malloc
+        * the requested size even if the actual extended attribute is tiny.
+        * because that malloc is for kernel wired memory, we have to put a
+        * sane limit on it.
+        *
+        * U32 running on K64 will yield 0x00000000ffffffff for uap->size
+        * U64 running on K64 will yield -1 (64 bits wide)
+        * U32/U64 running on K32 will yield -1 (32 bits wide)
+        */
+       if (uap->size == 0xffffffff || uap->size == (size_t)-1)
+               goto no_uio;
+
+       if (uap->value) {
+               if (uap->size > (size_t)XATTR_MAXSIZE)
+                       uap->size = XATTR_MAXSIZE;
+
+               auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_READ,
+                                           &uio_buf[0], sizeof(uio_buf));
+               uio_addiov(auio, uap->value, uap->size);
+       }
+no_uio:
+       error = vn_getxattr(vp, attrname, auio, &attrsize, uap->options, ctx);
+out:
+       vnode_put(vp);
+
+       if (auio) {
+               *retval = uap->size - uio_resid(auio);
+       } else {
+               *retval = (user_ssize_t)attrsize;
+       }
+
+       return (error);
+}
+
+/*
+ * Retrieve the data of an extended attribute.
+ */
+int
+fgetxattr(proc_t p, struct fgetxattr_args *uap, user_ssize_t *retval)
+{
+       vnode_t vp;
+       char attrname[XATTR_MAXNAMELEN+1];
+       uio_t auio = NULL;
+       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       size_t attrsize = 0;
+       size_t namelen;
+       int error;
+       char uio_buf[ UIO_SIZEOF(1) ];
+
+       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       if ( (error = file_vnode(uap->fd, &vp)) ) {
+               return (error);
+       }
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
+       }
+       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
+       if (error != 0) {
+               goto out;
+       }
+       if (xattr_protected(attrname)) {
+               error = EPERM;
+               goto out;
+       }
+       if (uap->value && uap->size > 0) {
+               auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_READ,
+                                           &uio_buf[0], sizeof(uio_buf));
+               uio_addiov(auio, uap->value, uap->size);
+       }
+
+       error = vn_getxattr(vp, attrname, auio, &attrsize, uap->options, vfs_context_current());
+out:
+       (void)vnode_put(vp);
+       file_drop(uap->fd);
+
+       if (auio) {
+               *retval = uap->size - uio_resid(auio);
+       } else {
+               *retval = (user_ssize_t)attrsize;
+       }
+       return (error);
+}
+
+/*
+ * Set the data of an extended attribute.
+ */
+int
+setxattr(proc_t p, struct setxattr_args *uap, int *retval)
+{
+       vnode_t vp;
+       struct nameidata nd;
+       char attrname[XATTR_MAXNAMELEN+1];
+       vfs_context_t ctx = vfs_context_current();
+       uio_t auio = NULL;
+       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       size_t namelen;
+       u_int32_t nameiflags;
+       int error;
+       char uio_buf[ UIO_SIZEOF(1) ];
+
+       if (uap->options & (XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
+       if (error != 0) {
+               if (error == EPERM) {
+                       /* if the string won't fit in attrname, copyinstr emits EPERM */
+                       return (ENAMETOOLONG);
+               }
+               /* Otherwise return the default error from copyinstr to detect ERANGE, etc */
+               return error;
+       }
+       if (xattr_protected(attrname))
+               return(EPERM);
+       if (uap->size != 0 && uap->value == 0) {
+               return (EINVAL);
+       }
+
+       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_SETXATTR, nameiflags, spacetype, uap->path, ctx);
+       if ((error = namei(&nd))) {
+               return (error);
+       }
+       vp = nd.ni_vp;
+       nameidone(&nd);
+
+       auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_WRITE,
+                                   &uio_buf[0], sizeof(uio_buf));
+       uio_addiov(auio, uap->value, uap->size);
+
+       error = vn_setxattr(vp, attrname, auio, uap->options, ctx);
+#if CONFIG_FSE
+       if (error == 0) {
+               add_fsevent(FSE_XATTR_MODIFIED, ctx,
+                   FSE_ARG_VNODE, vp,
+                   FSE_ARG_DONE);
+       }
+#endif
+       vnode_put(vp);
+       *retval = 0;
+       return (error);
+}
+
+/*
+ * Set the data of an extended attribute.
+ */
+int
+fsetxattr(proc_t p, struct fsetxattr_args *uap, int *retval)
+{
+       vnode_t vp;
+       char attrname[XATTR_MAXNAMELEN+1];
+       uio_t auio = NULL;
+       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       size_t namelen;
+       int error;
+       char uio_buf[ UIO_SIZEOF(1) ];
+#if CONFIG_FSE
+       vfs_context_t ctx = vfs_context_current();
+#endif
+
+       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
+       if (error != 0) {
+               if (error == EPERM) {
+                       /* if the string won't fit in attrname, copyinstr emits EPERM */
+                       return (ENAMETOOLONG);
+               }
+               /* Otherwise return the default error from copyinstr to detect ERANGE, etc */
+               return error;
+       }
+       if (xattr_protected(attrname))
+               return(EPERM);
+       if (uap->size != 0 && uap->value == 0) {
+               return (EINVAL);
+       }
+       if ( (error = file_vnode(uap->fd, &vp)) ) {
+               return (error);
+       }
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
+       }
+       auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_WRITE,
+                                   &uio_buf[0], sizeof(uio_buf));
+       uio_addiov(auio, uap->value, uap->size);
+
+       error = vn_setxattr(vp, attrname, auio, uap->options, vfs_context_current());
+#if CONFIG_FSE
+       if (error == 0) {
+               add_fsevent(FSE_XATTR_MODIFIED, ctx,
+                   FSE_ARG_VNODE, vp,
+                   FSE_ARG_DONE);
+       }
+#endif
+       vnode_put(vp);
+       file_drop(uap->fd);
+       *retval = 0;
+       return (error);
+}
+
+/*
+ * Remove an extended attribute.
+ * XXX Code duplication here.
+ */
+int
+removexattr(proc_t p, struct removexattr_args *uap, int *retval)
+{
+       vnode_t vp;
+       struct nameidata nd;
+       char attrname[XATTR_MAXNAMELEN+1];
+       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       vfs_context_t ctx = vfs_context_current();
+       size_t namelen;
+       u_int32_t nameiflags;
+       int error;
+
+       if (uap->options & (XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
+       if (error != 0) {
+               return (error);
+       }
+       if (xattr_protected(attrname))
+               return(EPERM);
+       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_REMOVEXATTR, nameiflags, spacetype, uap->path, ctx);
+       if ((error = namei(&nd))) {
+               return (error);
+       }
+       vp = nd.ni_vp;
+       nameidone(&nd);
+
+       error = vn_removexattr(vp, attrname, uap->options, ctx);
+#if CONFIG_FSE
+       if (error == 0) {
+               add_fsevent(FSE_XATTR_REMOVED, ctx,
+                   FSE_ARG_VNODE, vp,
+                   FSE_ARG_DONE);
+       }
+#endif
+       vnode_put(vp);
+       *retval = 0;
+       return (error);
+}
+
+/*
+ * Remove an extended attribute.
+ * XXX Code duplication here.
+ */
+int
+fremovexattr(__unused proc_t p, struct fremovexattr_args *uap, int *retval)
+{
+       vnode_t vp;
+       char attrname[XATTR_MAXNAMELEN+1];
+       size_t namelen;
+       int error;
+#if CONFIG_FSE
+       vfs_context_t ctx = vfs_context_current();
+#endif
+
+       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
+       if (error != 0) {
+               return (error);
+       }
+       if (xattr_protected(attrname))
+               return(EPERM);
+       if ( (error = file_vnode(uap->fd, &vp)) ) {
+               return (error);
+       }
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
+       }
+
+       error = vn_removexattr(vp, attrname, uap->options, vfs_context_current());
+#if CONFIG_FSE
+       if (error == 0) {
+               add_fsevent(FSE_XATTR_REMOVED, ctx,
+                   FSE_ARG_VNODE, vp,
+                   FSE_ARG_DONE);
+       }
+#endif
+       vnode_put(vp);
+       file_drop(uap->fd);
+       *retval = 0;
+       return (error);
+}
+
+/*
+ * Retrieve the list of extended attribute names.
+ * XXX Code duplication here.
+ */
+int
+listxattr(proc_t p, struct listxattr_args *uap, user_ssize_t *retval)
+{
+       vnode_t vp;
+       struct nameidata nd;
+       vfs_context_t ctx = vfs_context_current();
+       uio_t auio = NULL;
+       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       size_t attrsize = 0;
+       u_int32_t nameiflags;
+       int error;
+       char uio_buf[ UIO_SIZEOF(1) ];
+
+       if (uap->options & (XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
+       NDINIT(&nd, LOOKUP, OP_LISTXATTR, nameiflags, spacetype, uap->path, ctx);
+       if ((error = namei(&nd))) {
+               return (error);
+       }
+       vp = nd.ni_vp;
+       nameidone(&nd);
+       if (uap->namebuf != 0 && uap->bufsize > 0) {
+               auio = uio_createwithbuffer(1, 0, spacetype, UIO_READ,
+                                           &uio_buf[0], sizeof(uio_buf));
+               uio_addiov(auio, uap->namebuf, uap->bufsize);
+       }
+
+       error = vn_listxattr(vp, auio, &attrsize, uap->options, ctx);
+
+       vnode_put(vp);
+       if (auio) {
+               *retval = (user_ssize_t)uap->bufsize - uio_resid(auio);
+       } else {
+               *retval = (user_ssize_t)attrsize;
+       }
+       return (error);
+}
+
+/*
+ * Retrieve the list of extended attribute names.
+ * XXX Code duplication here.
+ */
+int
+flistxattr(proc_t p, struct flistxattr_args *uap, user_ssize_t *retval)
+{
+       vnode_t vp;
+       uio_t auio = NULL;
+       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
+       size_t attrsize = 0;
+       int error;
+       char uio_buf[ UIO_SIZEOF(1) ];
+
+       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY | XATTR_NODEFAULT))
+               return (EINVAL);
+
+       if ( (error = file_vnode(uap->fd, &vp)) ) {
+               return (error);
+       }
+       if ( (error = vnode_getwithref(vp)) ) {
+               file_drop(uap->fd);
+               return(error);
+       }
+       if (uap->namebuf != 0 && uap->bufsize > 0) {
+               auio = uio_createwithbuffer(1, 0, spacetype,
+                                                                         UIO_READ, &uio_buf[0], sizeof(uio_buf));
+               uio_addiov(auio, uap->namebuf, uap->bufsize);
+       }
+
+       error = vn_listxattr(vp, auio, &attrsize, uap->options, vfs_context_current());
+
+       vnode_put(vp);
+       file_drop(uap->fd);
+       if (auio) {
+               *retval = (user_ssize_t)uap->bufsize - uio_resid(auio);
+       } else {
+               *retval = (user_ssize_t)attrsize;
+       }
+       return (error);
+}
+
+static int fsgetpath_internal(
+       vfs_context_t ctx, int volfs_id, uint64_t objid,
+       vm_size_t bufsize, caddr_t buf, int *pathlen)
+{
+       int error;
+       struct mount *mp = NULL;
+       vnode_t vp;
+       int length;
+       int bpflags;
+       /* maximum number of times to retry build_path */
+       unsigned int retries = 0x10;
+
+       if (bufsize > PAGE_SIZE) {
+               return (EINVAL);
+       }
+
+       if (buf == NULL) {
+               return (ENOMEM);
+       }
+
+retry:
+       if ((mp = mount_lookupby_volfsid(volfs_id, 1)) == NULL) {
+               error = ENOTSUP;  /* unexpected failure */
+               return ENOTSUP;
+       }
+
+unionget:
+       if (objid == 2) {
+               error = VFS_ROOT(mp, &vp, ctx);
+       } else {
+               error = VFS_VGET(mp, (ino64_t)objid, &vp, ctx);
+       }
+
+       if (error == ENOENT && (mp->mnt_flag & MNT_UNION)) {
+               /*
+                * If the fileid isn't found and we're in a union
+                * mount volume, then see if the fileid is in the
+                * mounted-on volume.
+                */
+               struct mount *tmp = mp;
+               mp = vnode_mount(tmp->mnt_vnodecovered);
+               vfs_unbusy(tmp);
+               if (vfs_busy(mp, LK_NOWAIT) == 0)
+                       goto unionget;
+       } else {
+               vfs_unbusy(mp);
+       }
+
+       if (error) {
+               return error;
+       }
+
+#if CONFIG_MACF
+       error = mac_vnode_check_fsgetpath(ctx, vp);
+       if (error) {
+               vnode_put(vp);
+               return error;
+       }
+#endif
+
+       /* Obtain the absolute path to this vnode. */
+       bpflags = vfs_context_suser(ctx) ? BUILDPATH_CHECKACCESS : 0;
+       bpflags |= BUILDPATH_CHECK_MOVED;
+       error = build_path(vp, buf, bufsize, &length, bpflags, ctx);
+       vnode_put(vp);
+
+       if (error) {
+               /* there was a race building the path, try a few more times */
+               if (error == EAGAIN) {
+                       --retries;
+                       if (retries > 0)
+                               goto retry;
+
+                       error = ENOENT;
+               }
+               goto out;
+       }
+
+       AUDIT_ARG(text, buf);
+
+       if (kdebug_enable) {
+               long dbg_parms[NUMPARMS];
+               int  dbg_namelen;
+
+               dbg_namelen = (int)sizeof(dbg_parms);
+
+        if (length < dbg_namelen) {
+                       memcpy((char *)dbg_parms, buf, length);
+                       memset((char *)dbg_parms + length, 0, dbg_namelen - length);
+
+                       dbg_namelen = length;
+               } else {
+                       memcpy((char *)dbg_parms, buf + (length - dbg_namelen), dbg_namelen);
+               }
+
+               kdebug_vfs_lookup(dbg_parms, dbg_namelen, (void *)vp,
+                               KDBG_VFS_LOOKUP_FLAG_LOOKUP);
+       }
+
+       *pathlen = (user_ssize_t)length; /* may be superseded by error */
+
+out:
+       return (error);
+}
+
+/*
+ * Obtain the full pathname of a file system object by id.
+ */
+int
+fsgetpath(__unused proc_t p, struct fsgetpath_args *uap, user_ssize_t *retval)
+{
+       vfs_context_t ctx = vfs_context_current();
+       fsid_t fsid;
+       char *realpath;
+       int length;
+       int error;
+
+       if ((error = copyin(uap->fsid, (caddr_t)&fsid, sizeof(fsid)))) {
+               return (error);
+       }
+       AUDIT_ARG(value32, fsid.val[0]);
+       AUDIT_ARG(value64, uap->objid);
+       /* Restrict output buffer size for now. */
+
+       if (uap->bufsize > PAGE_SIZE) {
+               return (EINVAL);
+       }
+       MALLOC(realpath, char *, uap->bufsize, M_TEMP, M_WAITOK | M_ZERO);
+       if (realpath == NULL) {
+               return (ENOMEM);
+       }
+
+       error = fsgetpath_internal(
+               ctx, fsid.val[0], uap->objid,
+               uap->bufsize, realpath, &length);
+
+       if (error) {
+               goto out;
+       }
+
+       error = copyout((caddr_t)realpath, uap->buf, length);
+
+       *retval = (user_ssize_t)length; /* may be superseded by error */
+out:
+       if (realpath) {
+               FREE(realpath, M_TEMP);
+       }
+       return (error);
+}
+
+/*
+ * Common routine to handle various flavors of statfs data heading out
+ *     to user space.
+ *
+ * Returns:    0                       Success
+ *             EFAULT
+ */
+static int
+munge_statfs(struct mount *mp, struct vfsstatfs *sfsp,
+    user_addr_t bufp, int *sizep, boolean_t is_64_bit,
+    boolean_t partial_copy)
+{
+       int             error;
+       int             my_size, copy_size;
+
+       if (is_64_bit) {
+               struct user64_statfs sfs;
+               my_size = copy_size = sizeof(sfs);
+               bzero(&sfs, my_size);
+               sfs.f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
+               sfs.f_type = mp->mnt_vtable->vfc_typenum;
+               sfs.f_reserved1 = (short)sfsp->f_fssubtype;
+               sfs.f_bsize = (user64_long_t)sfsp->f_bsize;
+               sfs.f_iosize = (user64_long_t)sfsp->f_iosize;
+               sfs.f_blocks = (user64_long_t)sfsp->f_blocks;
+               sfs.f_bfree = (user64_long_t)sfsp->f_bfree;
+               sfs.f_bavail = (user64_long_t)sfsp->f_bavail;
+               sfs.f_files = (user64_long_t)sfsp->f_files;
+               sfs.f_ffree = (user64_long_t)sfsp->f_ffree;
+               sfs.f_fsid = sfsp->f_fsid;
+               sfs.f_owner = sfsp->f_owner;
+               if (mp->mnt_kern_flag & MNTK_TYPENAME_OVERRIDE) {
+                       strlcpy(&sfs.f_fstypename[0], &mp->fstypename_override[0], MFSNAMELEN);
+               } else {
+                       strlcpy(&sfs.f_fstypename[0], &sfsp->f_fstypename[0], MFSNAMELEN);
+               }
+               strlcpy(&sfs.f_mntonname[0], &sfsp->f_mntonname[0], MNAMELEN);
+               strlcpy(&sfs.f_mntfromname[0], &sfsp->f_mntfromname[0], MNAMELEN);
+
+               if (partial_copy) {
+                       copy_size -= (sizeof(sfs.f_reserved3) + sizeof(sfs.f_reserved4));
+               }
+               error = copyout((caddr_t)&sfs, bufp, copy_size);
+       }
+       else {
+               struct user32_statfs sfs;
+
+               my_size = copy_size = sizeof(sfs);
+               bzero(&sfs, my_size);
+
+               sfs.f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
+               sfs.f_type = mp->mnt_vtable->vfc_typenum;
+               sfs.f_reserved1 = (short)sfsp->f_fssubtype;
+
+               /*
+                * It's possible for there to be more than 2^^31 blocks in the filesystem, so we
+                * have to fudge the numbers here in that case.   We inflate the blocksize in order
+                * to reflect the filesystem size as best we can.
+                */
+               if ((sfsp->f_blocks > INT_MAX)
+                       /* Hack for 4061702 . I think the real fix is for Carbon to
+                        * look for some volume capability and not depend on hidden
+                        * semantics agreed between a FS and carbon.
+                        * f_blocks, f_bfree, and f_bavail set to -1 is the trigger
+                        * for Carbon to set bNoVolumeSizes volume attribute.
+                        * Without this the webdavfs files cannot be copied onto
+                        * disk as they look huge. This change should not affect
+                        * XSAN as they should not setting these to -1..
+                        */
+                        && (sfsp->f_blocks != 0xffffffffffffffffULL)
+                        && (sfsp->f_bfree != 0xffffffffffffffffULL)
+                        && (sfsp->f_bavail != 0xffffffffffffffffULL)) {
+                       int             shift;
+
+                       /*
+                        * Work out how far we have to shift the block count down to make it fit.
+                        * Note that it's possible to have to shift so far that the resulting
+                        * blocksize would be unreportably large.  At that point, we will clip
+                        * any values that don't fit.
+                        *
+                        * For safety's sake, we also ensure that f_iosize is never reported as
+                        * being smaller than f_bsize.
+                        */
+                       for (shift = 0; shift < 32; shift++) {
+                               if ((sfsp->f_blocks >> shift) <= INT_MAX)
+                                       break;
+                               if ((sfsp->f_bsize << (shift + 1)) > INT_MAX)
+                                       break;
+                       }
+#define __SHIFT_OR_CLIP(x, s)  ((((x) >> (s)) > INT_MAX) ? INT_MAX : ((x) >> (s)))
+                       sfs.f_blocks = (user32_long_t)__SHIFT_OR_CLIP(sfsp->f_blocks, shift);
+                       sfs.f_bfree = (user32_long_t)__SHIFT_OR_CLIP(sfsp->f_bfree, shift);
+                       sfs.f_bavail = (user32_long_t)__SHIFT_OR_CLIP(sfsp->f_bavail, shift);
+#undef __SHIFT_OR_CLIP
+                       sfs.f_bsize = (user32_long_t)(sfsp->f_bsize << shift);
+                       sfs.f_iosize = lmax(sfsp->f_iosize, sfsp->f_bsize);
+               } else {
+                       /* filesystem is small enough to be reported honestly */
+                       sfs.f_bsize = (user32_long_t)sfsp->f_bsize;
+                       sfs.f_iosize = (user32_long_t)sfsp->f_iosize;
+                       sfs.f_blocks = (user32_long_t)sfsp->f_blocks;
+                       sfs.f_bfree = (user32_long_t)sfsp->f_bfree;
+                       sfs.f_bavail = (user32_long_t)sfsp->f_bavail;
+               }
+               sfs.f_files = (user32_long_t)sfsp->f_files;
+               sfs.f_ffree = (user32_long_t)sfsp->f_ffree;
+               sfs.f_fsid = sfsp->f_fsid;
+               sfs.f_owner = sfsp->f_owner;
+               if (mp->mnt_kern_flag & MNTK_TYPENAME_OVERRIDE) {
+                       strlcpy(&sfs.f_fstypename[0], &mp->fstypename_override[0], MFSNAMELEN);
+               } else {
+                       strlcpy(&sfs.f_fstypename[0], &sfsp->f_fstypename[0], MFSNAMELEN);
+               }
+               strlcpy(&sfs.f_mntonname[0], &sfsp->f_mntonname[0], MNAMELEN);
+               strlcpy(&sfs.f_mntfromname[0], &sfsp->f_mntfromname[0], MNAMELEN);
+
+               if (partial_copy) {
+                       copy_size -= (sizeof(sfs.f_reserved3) + sizeof(sfs.f_reserved4));
+               }
+               error = copyout((caddr_t)&sfs, bufp, copy_size);
+       }
+
+       if (sizep != NULL) {
+               *sizep = my_size;
+       }
+       return(error);
+}
+
+/*
+ * copy stat structure into user_stat structure.
+ */
+void munge_user64_stat(struct stat *sbp, struct user64_stat *usbp)
+{
+       bzero(usbp, sizeof(*usbp));
+
+       usbp->st_dev = sbp->st_dev;
+       usbp->st_ino = sbp->st_ino;
+       usbp->st_mode = sbp->st_mode;
+       usbp->st_nlink = sbp->st_nlink;
+       usbp->st_uid = sbp->st_uid;
+       usbp->st_gid = sbp->st_gid;
+       usbp->st_rdev = sbp->st_rdev;
+#ifndef _POSIX_C_SOURCE
+       usbp->st_atimespec.tv_sec = sbp->st_atimespec.tv_sec;
+       usbp->st_atimespec.tv_nsec = sbp->st_atimespec.tv_nsec;
+       usbp->st_mtimespec.tv_sec = sbp->st_mtimespec.tv_sec;
+       usbp->st_mtimespec.tv_nsec = sbp->st_mtimespec.tv_nsec;
+       usbp->st_ctimespec.tv_sec = sbp->st_ctimespec.tv_sec;
+       usbp->st_ctimespec.tv_nsec = sbp->st_ctimespec.tv_nsec;
+#else
+       usbp->st_atime = sbp->st_atime;
+       usbp->st_atimensec = sbp->st_atimensec;
+       usbp->st_mtime = sbp->st_mtime;
+       usbp->st_mtimensec = sbp->st_mtimensec;
+       usbp->st_ctime = sbp->st_ctime;
+       usbp->st_ctimensec = sbp->st_ctimensec;
+#endif
+       usbp->st_size = sbp->st_size;
+       usbp->st_blocks = sbp->st_blocks;
+       usbp->st_blksize = sbp->st_blksize;
+       usbp->st_flags = sbp->st_flags;
+       usbp->st_gen = sbp->st_gen;
+       usbp->st_lspare = sbp->st_lspare;
+       usbp->st_qspare[0] = sbp->st_qspare[0];
+       usbp->st_qspare[1] = sbp->st_qspare[1];
+}
+
+void munge_user32_stat(struct stat *sbp, struct user32_stat *usbp)
+{
+       bzero(usbp, sizeof(*usbp));
+
+       usbp->st_dev = sbp->st_dev;
+       usbp->st_ino = sbp->st_ino;
+       usbp->st_mode = sbp->st_mode;
+       usbp->st_nlink = sbp->st_nlink;
+       usbp->st_uid = sbp->st_uid;
+       usbp->st_gid = sbp->st_gid;
+       usbp->st_rdev = sbp->st_rdev;
+#ifndef _POSIX_C_SOURCE
+       usbp->st_atimespec.tv_sec = sbp->st_atimespec.tv_sec;
+       usbp->st_atimespec.tv_nsec = sbp->st_atimespec.tv_nsec;
+       usbp->st_mtimespec.tv_sec = sbp->st_mtimespec.tv_sec;
+       usbp->st_mtimespec.tv_nsec = sbp->st_mtimespec.tv_nsec;
+       usbp->st_ctimespec.tv_sec = sbp->st_ctimespec.tv_sec;
+       usbp->st_ctimespec.tv_nsec = sbp->st_ctimespec.tv_nsec;
+#else
+       usbp->st_atime = sbp->st_atime;
+       usbp->st_atimensec = sbp->st_atimensec;
+       usbp->st_mtime = sbp->st_mtime;
+       usbp->st_mtimensec = sbp->st_mtimensec;
+       usbp->st_ctime = sbp->st_ctime;
+       usbp->st_ctimensec = sbp->st_ctimensec;
+#endif
+       usbp->st_size = sbp->st_size;
+       usbp->st_blocks = sbp->st_blocks;
+       usbp->st_blksize = sbp->st_blksize;
+       usbp->st_flags = sbp->st_flags;
+       usbp->st_gen = sbp->st_gen;
+       usbp->st_lspare = sbp->st_lspare;
+       usbp->st_qspare[0] = sbp->st_qspare[0];
+       usbp->st_qspare[1] = sbp->st_qspare[1];
+}
+
+/*
+ * copy stat64 structure into user_stat64 structure.
+ */
+void munge_user64_stat64(struct stat64 *sbp, struct user64_stat64 *usbp)
+{
+       bzero(usbp, sizeof(*usbp));
+
+       usbp->st_dev = sbp->st_dev;
+       usbp->st_ino = sbp->st_ino;
+       usbp->st_mode = sbp->st_mode;
+       usbp->st_nlink = sbp->st_nlink;
+       usbp->st_uid = sbp->st_uid;
+       usbp->st_gid = sbp->st_gid;
+       usbp->st_rdev = sbp->st_rdev;
+#ifndef _POSIX_C_SOURCE
+       usbp->st_atimespec.tv_sec = sbp->st_atimespec.tv_sec;
+       usbp->st_atimespec.tv_nsec = sbp->st_atimespec.tv_nsec;
+       usbp->st_mtimespec.tv_sec = sbp->st_mtimespec.tv_sec;
+       usbp->st_mtimespec.tv_nsec = sbp->st_mtimespec.tv_nsec;
+       usbp->st_ctimespec.tv_sec = sbp->st_ctimespec.tv_sec;
+       usbp->st_ctimespec.tv_nsec = sbp->st_ctimespec.tv_nsec;
+       usbp->st_birthtimespec.tv_sec = sbp->st_birthtimespec.tv_sec;
+       usbp->st_birthtimespec.tv_nsec = sbp->st_birthtimespec.tv_nsec;
+#else
+       usbp->st_atime = sbp->st_atime;
+       usbp->st_atimensec = sbp->st_atimensec;
+       usbp->st_mtime = sbp->st_mtime;
+       usbp->st_mtimensec = sbp->st_mtimensec;
+       usbp->st_ctime = sbp->st_ctime;
+       usbp->st_ctimensec = sbp->st_ctimensec;
+       usbp->st_birthtime = sbp->st_birthtime;
+       usbp->st_birthtimensec = sbp->st_birthtimensec;
+#endif
+       usbp->st_size = sbp->st_size;
+       usbp->st_blocks = sbp->st_blocks;
+       usbp->st_blksize = sbp->st_blksize;
+       usbp->st_flags = sbp->st_flags;
+       usbp->st_gen = sbp->st_gen;
+       usbp->st_lspare = sbp->st_lspare;
+       usbp->st_qspare[0] = sbp->st_qspare[0];
+       usbp->st_qspare[1] = sbp->st_qspare[1];
+}
+
+void munge_user32_stat64(struct stat64 *sbp, struct user32_stat64 *usbp)
+{
+       bzero(usbp, sizeof(*usbp));
+
+       usbp->st_dev = sbp->st_dev;
+       usbp->st_ino = sbp->st_ino;
+       usbp->st_mode = sbp->st_mode;
+       usbp->st_nlink = sbp->st_nlink;
+       usbp->st_uid = sbp->st_uid;
+       usbp->st_gid = sbp->st_gid;
+       usbp->st_rdev = sbp->st_rdev;
+#ifndef _POSIX_C_SOURCE
+       usbp->st_atimespec.tv_sec = sbp->st_atimespec.tv_sec;
+       usbp->st_atimespec.tv_nsec = sbp->st_atimespec.tv_nsec;
+       usbp->st_mtimespec.tv_sec = sbp->st_mtimespec.tv_sec;
+       usbp->st_mtimespec.tv_nsec = sbp->st_mtimespec.tv_nsec;
+       usbp->st_ctimespec.tv_sec = sbp->st_ctimespec.tv_sec;
+       usbp->st_ctimespec.tv_nsec = sbp->st_ctimespec.tv_nsec;
+       usbp->st_birthtimespec.tv_sec = sbp->st_birthtimespec.tv_sec;
+       usbp->st_birthtimespec.tv_nsec = sbp->st_birthtimespec.tv_nsec;
+#else
+       usbp->st_atime = sbp->st_atime;
+       usbp->st_atimensec = sbp->st_atimensec;
+       usbp->st_mtime = sbp->st_mtime;
+       usbp->st_mtimensec = sbp->st_mtimensec;
+       usbp->st_ctime = sbp->st_ctime;
+       usbp->st_ctimensec = sbp->st_ctimensec;
+       usbp->st_birthtime = sbp->st_birthtime;
+       usbp->st_birthtimensec = sbp->st_birthtimensec;
+#endif
+       usbp->st_size = sbp->st_size;
+       usbp->st_blocks = sbp->st_blocks;
+       usbp->st_blksize = sbp->st_blksize;
+       usbp->st_flags = sbp->st_flags;
+       usbp->st_gen = sbp->st_gen;
+       usbp->st_lspare = sbp->st_lspare;
+       usbp->st_qspare[0] = sbp->st_qspare[0];
+       usbp->st_qspare[1] = sbp->st_qspare[1];
 }
-/* end of fsctl system call */
 
 /*
- * An in-kernel sync for power management to call.
+ * Purge buffer cache for simulating cold starts
  */
-__private_extern__ int
-sync_internal(void)
+static int vnode_purge_callback(struct vnode *vp, __unused void *cargs)
 {
-       int error;
+       ubc_msync(vp, (off_t)0, ubc_getsize(vp), NULL /* off_t *resid_off */, UBC_PUSHALL | UBC_INVALIDATE);
 
-       struct sync_args data;
-
-       int retval[2];
+       return VNODE_RETURNED;
+}
 
+static int vfs_purge_callback(mount_t mp, __unused void * arg)
+{
+       vnode_iterate(mp, VNODE_WAIT | VNODE_ITERATE_ALL, vnode_purge_callback, NULL);
 
-       error = sync(current_proc(), &data, &retval[0]);
+       return VFS_RETURNED;
+}
 
+int
+vfs_purge(__unused struct proc *p, __unused struct vfs_purge_args *uap, __unused int32_t *retval)
+{
+       if (!kauth_cred_issuser(kauth_cred_get()))
+               return EPERM;
 
-       return (error);
-} /* end of sync_internal call */
+       vfs_iterate(0/* flags */, vfs_purge_callback, NULL);
 
+       return 0;
+}
 
 /*
- *  Retrieve the data of an extended attribute.
+ * gets the vnode associated with the (unnamed) snapshot directory
+ * for a Filesystem. The snapshot directory vnode is returned with
+ * an iocount on it.
  */
 int
-getxattr(struct proc *p, struct getxattr_args *uap, user_ssize_t *retval)
+vnode_get_snapdir(vnode_t rvp, vnode_t *sdvpp, vfs_context_t ctx)
 {
-       struct vnode *vp;
-       struct nameidata nd;
-       char attrname[XATTR_MAXNAMELEN+1];
-       struct vfs_context context;
-       uio_t auio = NULL;
-       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       size_t attrsize = 0;
-       size_t namelen;
-       u_long nameiflags;
-       int error;
-       char uio_buf[ UIO_SIZEOF(1) ];
+       return (VFS_VGET_SNAPDIR(vnode_mount(rvp), sdvpp, ctx));
+}
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+/*
+ * Get the snapshot vnode.
+ *
+ * If successful, the call returns with an iocount on *rvpp ,*sdvpp and
+ * needs nameidone() on ndp.
+ *
+ * If the snapshot vnode exists it is returned in ndp->ni_vp.
+ *
+ * If it returns with an error, *rvpp, *sdvpp are NULL and nameidone() is
+ * not needed.
+ */
+static int
+vnode_get_snapshot(int dirfd, vnode_t *rvpp, vnode_t *sdvpp,
+    user_addr_t name, struct nameidata *ndp, int32_t op,
+#if !CONFIG_TRIGGERS
+    __unused
+#endif
+    enum path_operation pathop,
+    vfs_context_t ctx)
+{
+       int error, i;
+       caddr_t name_buf;
+       size_t name_len;
+       struct vfs_attr vfa;
 
-       if (uap->options & XATTR_NOSECURITY)
-               return (EINVAL);
+       *sdvpp = NULLVP;
+       *rvpp = NULLVP;
 
-       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
-       NDINIT(&nd, LOOKUP, nameiflags, spacetype, uap->path, &context);
-       if ((error = namei(&nd))) {
+       error = vnode_getfromfd(ctx, dirfd, rvpp);
+       if (error)
                return (error);
-       }
-       vp = nd.ni_vp;
-       nameidone(&nd);
 
-       if ((error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen) != 0)) {
-               goto out;
-       }
-       if (xattr_protected(attrname)) {
-               error = EPERM;
+       if (!vnode_isvroot(*rvpp)) {
+               error = EINVAL;
                goto out;
        }
-       if (uap->value && uap->size > 0) {
-               auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_READ,
-                                           &uio_buf[0], sizeof(uio_buf));
-               uio_addiov(auio, uap->value, uap->size);
-       }
 
-       error = vn_getxattr(vp, attrname, auio, &attrsize, uap->options, &context);
-out:
-       vnode_put(vp);
-
-       if (auio) {
-               *retval = uap->size - uio_resid(auio);
-       } else {
-               *retval = (user_ssize_t)attrsize;
+       /* Make sure the filesystem supports snapshots */
+       VFSATTR_INIT(&vfa);
+       VFSATTR_WANTED(&vfa, f_capabilities);
+       if ((vfs_getattr(vnode_mount(*rvpp), &vfa, ctx) != 0) ||
+           !VFSATTR_IS_SUPPORTED(&vfa, f_capabilities) ||
+           !((vfa.f_capabilities.valid[VOL_CAPABILITIES_INTERFACES] &
+           VOL_CAP_INT_SNAPSHOT)) ||
+           !((vfa.f_capabilities.capabilities[VOL_CAPABILITIES_INTERFACES] &
+           VOL_CAP_INT_SNAPSHOT))) {
+               error = ENOTSUP;
+               goto out;
        }
 
-       return (error);
-}
-
-/*
- * Retrieve the data of an extended attribute.
- */
-int
-fgetxattr(struct proc *p, struct fgetxattr_args *uap, user_ssize_t *retval)
-{
-       struct vnode *vp;
-       char attrname[XATTR_MAXNAMELEN+1];
-       struct vfs_context context;
-       uio_t auio = NULL;
-       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       size_t attrsize = 0;
-       size_t namelen;
-       int error;
-       char uio_buf[ UIO_SIZEOF(1) ];
+       error = vnode_get_snapdir(*rvpp, sdvpp, ctx);
+       if (error)
+               goto out;
 
-       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY))
-               return (EINVAL);
+       MALLOC(name_buf, caddr_t, MAXPATHLEN, M_TEMP, M_WAITOK);
+       error = copyinstr(name, name_buf, MAXPATHLEN, &name_len);
+       if (error)
+               goto out1;
 
-       if ( (error = file_vnode(uap->fd, &vp)) ) {
-               return (error);
-       }
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
-       }
-       if ((error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen) != 0)) {
-               goto out;
+       /*
+        * Some sanity checks- name can't be empty, "." or ".." or have slashes.
+        * (the length returned by copyinstr includes the terminating NUL)
+        */
+       if ((name_len == 1) || (name_len == 2 && name_buf[0] == '.') ||
+           (name_len == 3 && name_buf[0] == '.' && name_buf[1] == '.')) {
+               error = EINVAL;
+               goto out1;
        }
-       if (xattr_protected(attrname)) {
-               error = EPERM;
-               goto out;
+       for (i = 0; i < (int)name_len && name_buf[i] != '/'; i++);
+       if (i < (int)name_len) {
+               error = EINVAL;
+               goto out1;
        }
-       if (uap->value && uap->size > 0) {
-               auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_READ,
-                                           &uio_buf[0], sizeof(uio_buf));
-               uio_addiov(auio, uap->value, uap->size);
+
+#if CONFIG_MACF
+       if (op == CREATE) {
+               error = mac_mount_check_snapshot_create(ctx, vnode_mount(*rvpp),
+                   name_buf);
+       } else if (op == DELETE) {
+               error = mac_mount_check_snapshot_delete(ctx, vnode_mount(*rvpp),
+                   name_buf);
        }
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       if (error)
+               goto out1;
+#endif
 
-       error = vn_getxattr(vp, attrname, auio, &attrsize, uap->options, &context);
-out:
-       (void)vnode_put(vp);
-       file_drop(uap->fd);
+       /* Check if the snapshot already exists ... */
+       NDINIT(ndp, op, pathop, USEDVP | NOCACHE | AUDITVNPATH1,
+           UIO_SYSSPACE, CAST_USER_ADDR_T(name_buf), ctx);
+       ndp->ni_dvp = *sdvpp;
 
-       if (auio) {
-               *retval = uap->size - uio_resid(auio);
-       } else {
-               *retval = (user_ssize_t)attrsize;
+       error = namei(ndp);
+out1:
+       FREE(name_buf, M_TEMP);
+out:
+       if (error) {
+               if (*sdvpp) {
+                       vnode_put(*sdvpp);
+                       *sdvpp = NULLVP;
+               }
+               if (*rvpp) {
+                       vnode_put(*rvpp);
+                       *rvpp = NULLVP;
+               }
        }
        return (error);
 }
 
 /*
- * Set the data of an extended attribute.
+ * create a filesystem snapshot (for supporting filesystems)
+ *
+ * A much simplified version of openat(dirfd, name, O_CREAT | O_EXCL)
+ * We get to the (unnamed) snapshot directory vnode and create the vnode
+ * for the snapshot in it.
+ *
+ * Restrictions:
+ *
+ *    a) Passed in name for snapshot cannot have slashes.
+ *    b) name can't be "." or ".."
+ *
+ * Since this requires superuser privileges, vnode_authorize calls are not
+ * made.
  */
-int
-setxattr(struct proc *p, struct setxattr_args *uap, int *retval)
+static int
+snapshot_create(int dirfd, user_addr_t name, __unused uint32_t flags,
+    vfs_context_t ctx)
 {
-       struct vnode *vp;
-       struct nameidata nd;
-       char attrname[XATTR_MAXNAMELEN+1];
-       struct vfs_context context;
-       uio_t auio = NULL;
-       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       size_t namelen;
-       u_long nameiflags;
+       vnode_t rvp, snapdvp;
        int error;
-       char uio_buf[ UIO_SIZEOF(1) ];
+       struct nameidata namend;
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       error = vnode_get_snapshot(dirfd, &rvp, &snapdvp, name, &namend, CREATE,
+           OP_LINK, ctx);
+       if (error)
+               return (error);
 
-       if (uap->options & XATTR_NOSECURITY)
-               return (EINVAL);
+       if (namend.ni_vp) {
+               vnode_put(namend.ni_vp);
+               error = EEXIST;
+       } else {
+               struct vnode_attr va;
+               vnode_t vp = NULLVP;
 
-       if ((error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen) != 0)) {
-               return (error);
-       }
-       if (xattr_protected(attrname))
-               return(EPERM);
-       if (uap->value == 0 || uap->size == 0) {
-               return (EINVAL);
-       }
+               VATTR_INIT(&va);
+               VATTR_SET(&va, va_type, VREG);
+               VATTR_SET(&va, va_mode, 0);
 
-       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
-       NDINIT(&nd, LOOKUP, nameiflags, spacetype, uap->path, &context);
-       if ((error = namei(&nd))) {
-               return (error);
+               error = vn_create(snapdvp, &vp, &namend, &va,
+                   VN_CREATE_NOAUTH  | VN_CREATE_NOINHERIT, 0, NULL, ctx);
+               if (!error && vp)
+                       vnode_put(vp);
        }
-       vp = nd.ni_vp;
-       nameidone(&nd);
-
-       auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_WRITE,
-                                   &uio_buf[0], sizeof(uio_buf));
-       uio_addiov(auio, uap->value, uap->size);
 
-       error = vn_setxattr(vp, attrname, auio, uap->options, &context);
-       vnode_put(vp);
-       *retval = 0;
+       nameidone(&namend);
+       vnode_put(snapdvp);
+       vnode_put(rvp);
        return (error);
 }
 
 /*
- * Set the data of an extended attribute.
+ * Delete a Filesystem snapshot
+ *
+ * get the vnode for the unnamed snapshot directory and the snapshot and
+ * delete the snapshot.
  */
-int
-fsetxattr(struct proc *p, struct fsetxattr_args *uap, int *retval)
+static int
+snapshot_delete(int dirfd, user_addr_t name, __unused uint32_t flags,
+    vfs_context_t ctx)
 {
-       struct vnode *vp;
-       char attrname[XATTR_MAXNAMELEN+1];
-       struct vfs_context context;
-       uio_t auio = NULL;
-       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       size_t namelen;
+       vnode_t rvp, snapdvp;
        int error;
-       char uio_buf[ UIO_SIZEOF(1) ];
+       struct nameidata namend;
 
-       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY))
-               return (EINVAL);
+       error = vnode_get_snapshot(dirfd, &rvp, &snapdvp, name, &namend, DELETE,
+           OP_UNLINK, ctx);
+       if (error)
+               goto out;
 
-       if ((error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen) != 0)) {
-               return (error);
-       }
-       if (xattr_protected(attrname))
-               return(EPERM);
-       if (uap->value == 0 || uap->size == 0) {
-               return (EINVAL);
-       }
-       if ( (error = file_vnode(uap->fd, &vp)) ) {
-               return (error);
-       }
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
-       }
-       auio = uio_createwithbuffer(1, uap->position, spacetype, UIO_WRITE,
-                                   &uio_buf[0], sizeof(uio_buf));
-       uio_addiov(auio, uap->value, uap->size);
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       error = VNOP_REMOVE(snapdvp, namend.ni_vp, &namend.ni_cnd,
+           VNODE_REMOVE_SKIP_NAMESPACE_EVENT, ctx);
 
-       error = vn_setxattr(vp, attrname, auio, uap->options, &context);
-       vnode_put(vp);
-       file_drop(uap->fd);
-       *retval = 0;
+       vnode_put(namend.ni_vp);
+       nameidone(&namend);
+       vnode_put(snapdvp);
+       vnode_put(rvp);
+out:
        return (error);
 }
 
 /*
- * Remove an extended attribute.
+ * Revert a filesystem to a snapshot
+ *
+ * Marks the filesystem to revert to the given snapshot on next mount.
  */
-#warning "code duplication"
-int
-removexattr(struct proc *p, struct removexattr_args *uap, int *retval)
+static int
+snapshot_revert(int dirfd, user_addr_t name, __unused uint32_t flags,
+                vfs_context_t ctx)
 {
-       struct vnode *vp;
-       struct nameidata nd;
-       char attrname[XATTR_MAXNAMELEN+1];
-       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       struct vfs_context context;
-       size_t namelen;
-       u_long nameiflags;
-       int error;
+    int error;
+    vnode_t rvp;
+    mount_t mp;
+    struct fs_snapshot_revert_args revert_data;
+    struct componentname cnp;
+    caddr_t name_buf;
+    size_t name_len;
+
+    error = vnode_getfromfd(ctx, dirfd, &rvp);
+    if (error) {
+        return (error);
+    }
+    mp = vnode_mount(rvp);
 
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+    MALLOC(name_buf, caddr_t, MAXPATHLEN, M_TEMP, M_WAITOK);
+    error = copyinstr(name, name_buf, MAXPATHLEN, &name_len);
+    if (error) {
+        FREE(name_buf, M_TEMP);
+        vnode_put(rvp);
+        return (error);
+    }
 
-       if (uap->options & XATTR_NOSECURITY)
-               return (EINVAL);
+#if CONFIG_MACF
+    error = mac_mount_check_snapshot_revert(ctx, mp, name_buf);
+    if (error) {
+        FREE(name_buf, M_TEMP);
+        vnode_put(rvp);
+        return (error);
+    }
+#endif
 
-       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
-       if (error != 0) {
-               return (error);
-       }
-       if (xattr_protected(attrname))
-               return(EPERM);
-       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
-       NDINIT(&nd, LOOKUP, nameiflags, spacetype, uap->path, &context);
-       if ((error = namei(&nd))) {
-               return (error);
-       }
-       vp = nd.ni_vp;
-       nameidone(&nd);
+    /*
+     * Grab mount_iterref so that we can release the vnode,
+     * since VFSIOC_REVERT_SNAPSHOT could conceivably cause a sync.
+     */
+    error = mount_iterref (mp, 0);
+    vnode_put(rvp);
+    if (error) {
+        FREE(name_buf, M_TEMP);
+        return (error);
+    }
 
-       error = vn_removexattr(vp, attrname, uap->options, &context);
-       vnode_put(vp);
-       *retval = 0;
-       return (error);
-}
+    memset(&cnp, 0, sizeof(cnp));
+    cnp.cn_pnbuf = (char *)name_buf;
+    cnp.cn_nameiop = LOOKUP;
+    cnp.cn_flags = ISLASTCN | HASBUF;
+    cnp.cn_pnlen = MAXPATHLEN;
+    cnp.cn_nameptr = cnp.cn_pnbuf;
+    cnp.cn_namelen = (int)name_len;
+    revert_data.sr_cnp = &cnp;
+
+    error = VFS_IOCTL(mp, VFSIOC_REVERT_SNAPSHOT, (caddr_t)&revert_data, 0, ctx);
+    mount_iterdrop(mp);
+    FREE(name_buf, M_TEMP);
+
+    if (error) {
+        /* If there was any error, try again using VNOP_IOCTL */
 
-/*
- * Remove an extended attribute.
- */
-#warning "code duplication"
-int
-fremovexattr(struct proc *p, struct fremovexattr_args *uap, int *retval)
-{
-       struct vnode *vp;
-       char attrname[XATTR_MAXNAMELEN+1];
-       struct vfs_context context;
-       size_t namelen;
-       int error;
+        vnode_t snapdvp;
+        struct nameidata namend;
 
-       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY))
-               return (EINVAL);
+        error = vnode_get_snapshot(dirfd, &rvp, &snapdvp, name, &namend, LOOKUP,
+                                   OP_LOOKUP, ctx);
+        if (error) {
+            return (error);
+        }
 
-       error = copyinstr(uap->attrname, attrname, sizeof(attrname), &namelen);
-       if (error != 0) {
-               return (error);
-       }
-       if (xattr_protected(attrname))
-               return(EPERM);
-       if ( (error = file_vnode(uap->fd, &vp)) ) {
-               return (error);
-       }
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
-       }
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
 
-       error = vn_removexattr(vp, attrname, uap->options, &context);
-       vnode_put(vp);
-       file_drop(uap->fd);
-       *retval = 0;
+        error = VNOP_IOCTL(namend.ni_vp, APFSIOC_REVERT_TO_SNAPSHOT, (caddr_t) NULL,
+                           0, ctx);
+
+        vnode_put(namend.ni_vp);
+        nameidone(&namend);
+        vnode_put(snapdvp);
+        vnode_put(rvp);
+    }
+
        return (error);
 }
 
 /*
- * Retrieve the list of extended attribute names.
+ * rename a Filesystem snapshot
+ *
+ * get the vnode for the unnamed snapshot directory and the snapshot and
+ * rename the snapshot. This is a very specialised (and simple) case of
+ * rename(2) (which has to deal with a lot more complications). It differs
+ * slightly from rename(2) in that EEXIST is returned if the new name exists.
  */
-#warning "code duplication"
-int
-listxattr(struct proc *p, struct listxattr_args *uap, user_ssize_t *retval)
+static int
+snapshot_rename(int dirfd, user_addr_t old, user_addr_t new,
+    __unused uint32_t flags, vfs_context_t ctx)
 {
-       struct vnode *vp;
-       struct nameidata nd;
-       struct vfs_context context;
-       uio_t auio = NULL;
-       int spacetype = IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       size_t attrsize = 0;
-       u_long nameiflags;
-       int error;
-       char uio_buf[ UIO_SIZEOF(1) ];
-
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
+       vnode_t rvp, snapdvp;
+       int error, i;
+       caddr_t newname_buf;
+       size_t name_len;
+       vnode_t fvp;
+       struct nameidata *fromnd, *tond;
+       /* carving out a chunk for structs that are too big to be on stack. */
+       struct {
+               struct nameidata from_node;
+               struct nameidata to_node;
+       } * __rename_data;
+
+       MALLOC(__rename_data, void *, sizeof(*__rename_data), M_TEMP, M_WAITOK);
+       fromnd = &__rename_data->from_node;
+       tond = &__rename_data->to_node;
+
+       error = vnode_get_snapshot(dirfd, &rvp, &snapdvp, old, fromnd, DELETE,
+           OP_UNLINK, ctx);
+       if (error)
+               goto out;
+       fvp  = fromnd->ni_vp;
 
-       if (uap->options & XATTR_NOSECURITY)
-               return (EINVAL);
+       MALLOC(newname_buf, caddr_t, MAXPATHLEN, M_TEMP, M_WAITOK);
+       error = copyinstr(new, newname_buf, MAXPATHLEN, &name_len);
+       if (error)
+               goto out1;
 
-       nameiflags = (uap->options & XATTR_NOFOLLOW) ? 0 : FOLLOW;
-       NDINIT(&nd, LOOKUP, nameiflags, spacetype, uap->path, &context);
-       if ((error = namei(&nd))) {
-               return (error);
+       /*
+        * Some sanity checks- new name can't be empty, "." or ".." or have
+        * slashes.
+        * (the length returned by copyinstr includes the terminating NUL)
+        *
+        * The FS rename VNOP is suppossed to handle this but we'll pick it
+        * off here itself.
+        */
+       if ((name_len == 1) || (name_len == 2 && newname_buf[0] == '.') ||
+           (name_len == 3 && newname_buf[0] == '.' && newname_buf[1] == '.')) {
+               error = EINVAL;
+               goto out1;
        }
-       vp = nd.ni_vp;
-       nameidone(&nd);
-       if (uap->namebuf != 0 && uap->bufsize > 0) {
-               // LP64todo - fix this!
-               auio = uio_createwithbuffer(1, 0, spacetype, 
-                                                                         UIO_READ, &uio_buf[0], sizeof(uio_buf));
-               uio_addiov(auio, uap->namebuf, uap->bufsize);
+       for (i = 0; i < (int)name_len && newname_buf[i] != '/'; i++);
+       if (i < (int)name_len) {
+               error = EINVAL;
+               goto out1;
        }
 
-       error = vn_listxattr(vp, auio, &attrsize, uap->options, &context);
+#if CONFIG_MACF
+       error = mac_mount_check_snapshot_create(ctx, vnode_mount(rvp),
+           newname_buf);
+       if (error)
+               goto out1;
+#endif
 
-       vnode_put(vp);
-       if (auio) {
-               *retval = (user_ssize_t)uap->bufsize - uio_resid(auio);
-       } else {
-               *retval = (user_ssize_t)attrsize;
+       NDINIT(tond, RENAME, OP_RENAME, USEDVP | NOCACHE | AUDITVNPATH2,
+           UIO_SYSSPACE, CAST_USER_ADDR_T(newname_buf), ctx);
+       tond->ni_dvp = snapdvp;
+
+       error = namei(tond);
+       if (error) {
+               goto out2;
+       } else if (tond->ni_vp) {
+               /*
+                * snapshot rename behaves differently than rename(2) - if the
+                * new name exists, EEXIST is returned.
+                */
+               vnode_put(tond->ni_vp);
+               error = EEXIST;
+               goto out2;
        }
+
+       error = VNOP_RENAME(snapdvp, fvp, &fromnd->ni_cnd, snapdvp, NULLVP,
+           &tond->ni_cnd, ctx);
+
+out2:
+       nameidone(tond);
+out1:
+       FREE(newname_buf, M_TEMP);
+       vnode_put(fvp);
+       vnode_put(snapdvp);
+       vnode_put(rvp);
+       nameidone(fromnd);
+out:
+       FREE(__rename_data, M_TEMP);
        return (error);
 }
 
 /*
- * Retrieve the list of extended attribute names.
+ * Mount a Filesystem snapshot
+ *
+ * get the vnode for the unnamed snapshot directory and the snapshot and
+ * mount the snapshot.
  */
-#warning "code duplication"
-int
-flistxattr(struct proc *p, struct flistxattr_args *uap, user_ssize_t *retval)
+static int
+snapshot_mount(int dirfd, user_addr_t name, user_addr_t directory,
+    __unused user_addr_t mnt_data, __unused uint32_t flags, vfs_context_t ctx)
 {
-       struct vnode *vp;
-       struct vfs_context context;
-       uio_t auio = NULL;
-       int spacetype = proc_is64bit(p) ? UIO_USERSPACE64 : UIO_USERSPACE32;
-       size_t attrsize = 0;
+       vnode_t rvp, snapdvp, snapvp, vp, pvp;
        int error;
-       char uio_buf[ UIO_SIZEOF(1) ];
-
-       if (uap->options & (XATTR_NOFOLLOW | XATTR_NOSECURITY))
-               return (EINVAL);
+       struct nameidata *snapndp, *dirndp;
+       /* carving out a chunk for structs that are too big to be on stack. */
+       struct {
+               struct nameidata snapnd;
+               struct nameidata dirnd;
+       } * __snapshot_mount_data;
+
+       MALLOC(__snapshot_mount_data, void *, sizeof(*__snapshot_mount_data),
+           M_TEMP, M_WAITOK);
+       snapndp = &__snapshot_mount_data->snapnd;
+       dirndp = &__snapshot_mount_data->dirnd;
+
+       error = vnode_get_snapshot(dirfd, &rvp, &snapdvp, name, snapndp, LOOKUP,
+           OP_LOOKUP, ctx);
+       if (error)
+               goto out;
 
-       if ( (error = file_vnode(uap->fd, &vp)) ) {
-               return (error);
-       }
-       if ( (error = vnode_getwithref(vp)) ) {
-               file_drop(uap->fd);
-               return(error);
-       }
-       if (uap->namebuf != 0 && uap->bufsize > 0) {
-               // LP64todo - fix this!
-               auio = uio_createwithbuffer(1, 0, spacetype, 
-                                                                         UIO_READ, &uio_buf[0], sizeof(uio_buf));
-               uio_addiov(auio, uap->namebuf, uap->bufsize);
+       snapvp  = snapndp->ni_vp;
+       if (!vnode_mount(rvp) || (vnode_mount(rvp) == dead_mountp)) {
+               error = EIO;
+               goto out1;
        }
-       context.vc_proc = p;
-       context.vc_ucred = kauth_cred_get();
 
-       error = vn_listxattr(vp, auio, &attrsize, uap->options, &context);
+       /* Get the vnode to be covered */
+       NDINIT(dirndp, LOOKUP, OP_MOUNT, FOLLOW | AUDITVNPATH1 | WANTPARENT,
+           UIO_USERSPACE, directory, ctx);
+       error = namei(dirndp);
+       if (error)
+               goto out1;
+
+       vp = dirndp->ni_vp;
+       pvp = dirndp->ni_dvp;
 
-       vnode_put(vp);
-       file_drop(uap->fd);
-       if (auio) {
-               *retval = (user_ssize_t)uap->bufsize - uio_resid(auio);
+       if ((vp->v_flag & VROOT) && (vp->v_mount->mnt_flag & MNT_ROOTFS)) {
+               error = EINVAL;
        } else {
-               *retval = (user_ssize_t)attrsize;
+               mount_t mp = vnode_mount(rvp);
+               struct fs_snapshot_mount_args smnt_data;
+
+               smnt_data.sm_mp  = mp;
+               smnt_data.sm_cnp = &snapndp->ni_cnd;
+               error = mount_common(mp->mnt_vfsstat.f_fstypename, pvp, vp,
+                  &dirndp->ni_cnd, CAST_USER_ADDR_T(&smnt_data), flags & MNT_DONTBROWSE,
+                  KERNEL_MOUNT_SNAPSHOT, NULL, FALSE, ctx);
        }
+
+       vnode_put(vp);
+       vnode_put(pvp);
+       nameidone(dirndp);
+out1:
+       vnode_put(snapvp);
+       vnode_put(snapdvp);
+       vnode_put(rvp);
+       nameidone(snapndp);
+out:
+       FREE(__snapshot_mount_data, M_TEMP);
        return (error);
 }
 
 /*
- * Common routine to handle various flavors of statfs data heading out
- *     to user space.
+ * Root from a snapshot of the filesystem
+ *
+ * Marks the filesystem to root from the given snapshot on next boot.
  */
 static int
-munge_statfs(struct mount *mp, struct vfsstatfs *sfsp, 
-    user_addr_t bufp, int *sizep, boolean_t is_64_bit, 
-    boolean_t partial_copy)
+snapshot_root(int dirfd, user_addr_t name, __unused uint32_t flags,
+                vfs_context_t ctx)
 {
-       int             error;
-       int             my_size, copy_size;
+    int error;
+    vnode_t rvp;
+    mount_t mp;
+    struct fs_snapshot_root_args root_data;
+    struct componentname cnp;
+    caddr_t name_buf;
+    size_t name_len;
+    
+    error = vnode_getfromfd(ctx, dirfd, &rvp);
+    if (error) {
+        return (error);
+    }
+    mp = vnode_mount(rvp);
+    
+    MALLOC(name_buf, caddr_t, MAXPATHLEN, M_TEMP, M_WAITOK);
+    error = copyinstr(name, name_buf, MAXPATHLEN, &name_len);
+    if (error) {
+        FREE(name_buf, M_TEMP);
+        vnode_put(rvp);
+        return (error);
+    }
+   
+    // XXX MAC checks ?
+    
+    /*
+     * Grab mount_iterref so that we can release the vnode,
+     * since VFSIOC_ROOT_SNAPSHOT could conceivably cause a sync.
+     */
+    error = mount_iterref (mp, 0);
+    vnode_put(rvp);
+    if (error) {
+        FREE(name_buf, M_TEMP);
+        return (error);
+    }
+    
+    memset(&cnp, 0, sizeof(cnp));
+    cnp.cn_pnbuf = (char *)name_buf;
+    cnp.cn_nameiop = LOOKUP;
+    cnp.cn_flags = ISLASTCN | HASBUF;
+    cnp.cn_pnlen = MAXPATHLEN;
+    cnp.cn_nameptr = cnp.cn_pnbuf;
+    cnp.cn_namelen = (int)name_len;
+    root_data.sr_cnp = &cnp;
+    
+    error = VFS_IOCTL(mp, VFSIOC_ROOT_SNAPSHOT, (caddr_t)&root_data, 0, ctx);
+    
+    mount_iterdrop(mp);
+    FREE(name_buf, M_TEMP);
+    
+    return (error);
+}
 
-       if (is_64_bit) {
-               struct user_statfs sfs;
-               my_size = copy_size = sizeof(sfs);
-               bzero(&sfs, my_size);
-               sfs.f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
-               sfs.f_type = mp->mnt_vtable->vfc_typenum;
-               sfs.f_reserved1 = (short)sfsp->f_fssubtype;
-               sfs.f_bsize = (user_long_t)sfsp->f_bsize;
-               sfs.f_iosize = (user_long_t)sfsp->f_iosize;
-               sfs.f_blocks = (user_long_t)sfsp->f_blocks;
-               sfs.f_bfree = (user_long_t)sfsp->f_bfree;
-               sfs.f_bavail = (user_long_t)sfsp->f_bavail;
-               sfs.f_files = (user_long_t)sfsp->f_files;
-               sfs.f_ffree = (user_long_t)sfsp->f_ffree;
-               sfs.f_fsid = sfsp->f_fsid;
-               sfs.f_owner = sfsp->f_owner;
-               strncpy(&sfs.f_fstypename[0], &sfsp->f_fstypename[0], MFSNAMELEN-1);
-               strncpy(&sfs.f_mntonname[0], &sfsp->f_mntonname[0], MNAMELEN-1);
-               strncpy(&sfs.f_mntfromname[0], &sfsp->f_mntfromname[0], MNAMELEN-1);
+/*
+ * FS snapshot operations dispatcher
+ */
+int
+fs_snapshot(__unused proc_t p, struct fs_snapshot_args *uap,
+    __unused int32_t *retval)
+{
+       int error;
+       vfs_context_t ctx = vfs_context_current();
 
-               if (partial_copy) {
-                       copy_size -= (sizeof(sfs.f_reserved3) + sizeof(sfs.f_reserved4));
-               }
-               error = copyout((caddr_t)&sfs, bufp, copy_size);
-       }
-       else {
-               struct statfs sfs;
-               my_size = copy_size = sizeof(sfs);
-               bzero(&sfs, my_size);
-               
-               sfs.f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
-               sfs.f_type = mp->mnt_vtable->vfc_typenum;
-               sfs.f_reserved1 = (short)sfsp->f_fssubtype;
-               
-               /*
-                * It's possible for there to be more than 2^^31 blocks in the filesystem, so we
-                * have to fudge the numbers here in that case.   We inflate the blocksize in order
-                * to reflect the filesystem size as best we can.
-                */
-               if ((sfsp->f_blocks > LONG_MAX) 
-                       /* Hack for 4061702 . I think the real fix is for Carbon to 
-                        * look for some volume capability and not depend on hidden
-                        * semantics agreed between a FS and carbon. 
-                        * f_blocks, f_bfree, and f_bavail set to -1 is the trigger
-                        * for Carbon to set bNoVolumeSizes volume attribute.
-                        * Without this the webdavfs files cannot be copied onto 
-                        * disk as they look huge. This change should not affect
-                        * XSAN as they should not setting these to -1..
-                        */
-                        && (sfsp->f_blocks != 0xffffffffffffffff)
-                        && (sfsp->f_bfree != 0xffffffffffffffff)
-                        && (sfsp->f_bavail != 0xffffffffffffffff)) {
-                       int             shift;
+       AUDIT_ARG(fd, uap->dirfd);
+       AUDIT_ARG(value32, uap->op);
 
-                       /*
-                        * Work out how far we have to shift the block count down to make it fit.
-                        * Note that it's possible to have to shift so far that the resulting
-                        * blocksize would be unreportably large.  At that point, we will clip
-                        * any values that don't fit.
-                        *
-                        * For safety's sake, we also ensure that f_iosize is never reported as
-                        * being smaller than f_bsize.
-                        */
-                       for (shift = 0; shift < 32; shift++) {
-                               if ((sfsp->f_blocks >> shift) <= LONG_MAX)
-                                       break;
-                               if ((sfsp->f_bsize << (shift + 1)) > LONG_MAX)
-                                       break;
-                       }
-#define __SHIFT_OR_CLIP(x, s)  ((((x) >> (s)) > LONG_MAX) ? LONG_MAX : ((x) >> (s)))
-                       sfs.f_blocks = (long)__SHIFT_OR_CLIP(sfsp->f_blocks, shift);
-                       sfs.f_bfree = (long)__SHIFT_OR_CLIP(sfsp->f_bfree, shift);
-                       sfs.f_bavail = (long)__SHIFT_OR_CLIP(sfsp->f_bavail, shift);
-#undef __SHIFT_OR_CLIP
-                       sfs.f_bsize = (long)(sfsp->f_bsize << shift);
-                       sfs.f_iosize = lmax(sfsp->f_iosize, sfsp->f_bsize);
-               } else {
-                       /* filesystem is small enough to be reported honestly */
-                       sfs.f_bsize = (long)sfsp->f_bsize;
-                       sfs.f_iosize = (long)sfsp->f_iosize;
-                       sfs.f_blocks = (long)sfsp->f_blocks;
-                       sfs.f_bfree = (long)sfsp->f_bfree;
-                       sfs.f_bavail = (long)sfsp->f_bavail;
-               }
-               sfs.f_files = (long)sfsp->f_files;
-               sfs.f_ffree = (long)sfsp->f_ffree;
-               sfs.f_fsid = sfsp->f_fsid;
-               sfs.f_owner = sfsp->f_owner;
-               strncpy(&sfs.f_fstypename[0], &sfsp->f_fstypename[0], MFSNAMELEN-1);
-               strncpy(&sfs.f_mntonname[0], &sfsp->f_mntonname[0], MNAMELEN-1);
-               strncpy(&sfs.f_mntfromname[0], &sfsp->f_mntfromname[0], MNAMELEN-1);
+       error = priv_check_cred(vfs_context_ucred(ctx), PRIV_VFS_SNAPSHOT, 0);
+       if (error)
+               return (error);
 
-               if (partial_copy) {
-                       copy_size -= (sizeof(sfs.f_reserved3) + sizeof(sfs.f_reserved4));
-               }
-               error = copyout((caddr_t)&sfs, bufp, copy_size);
-       }
-       
-       if (sizep != NULL) {
-               *sizep = my_size;
+       switch (uap->op) {
+       case SNAPSHOT_OP_CREATE:
+               error = snapshot_create(uap->dirfd, uap->name1, uap->flags, ctx);
+               break;
+       case SNAPSHOT_OP_DELETE:
+               error = snapshot_delete(uap->dirfd, uap->name1, uap->flags, ctx);
+               break;
+       case SNAPSHOT_OP_RENAME:
+               error = snapshot_rename(uap->dirfd, uap->name1, uap->name2,
+                   uap->flags, ctx);
+               break;
+       case SNAPSHOT_OP_MOUNT:
+               error = snapshot_mount(uap->dirfd, uap->name1, uap->name2,
+                   uap->data, uap->flags, ctx);
+               break;
+    case SNAPSHOT_OP_REVERT:
+        error = snapshot_revert(uap->dirfd, uap->name1, uap->flags, ctx);
+        break;
+#if CONFIG_MNT_ROOTSNAP
+       case SNAPSHOT_OP_ROOT:
+               error = snapshot_root(uap->dirfd, uap->name1, uap->flags, ctx);
+               break;
+#endif /* CONFIG_MNT_ROOTSNAP */
+       default:
+               error = ENOSYS;
        }
-       return(error);
-}
 
-/*
- * copy stat structure into user_stat structure.
- */
-void munge_stat(struct stat *sbp, struct user_stat *usbp)
-{
-       usbp->st_dev = sbp->st_dev;
-       usbp->st_ino = sbp->st_ino;
-       usbp->st_mode = sbp->st_mode;
-       usbp->st_nlink = sbp->st_nlink;
-       usbp->st_uid = sbp->st_uid;
-       usbp->st_gid = sbp->st_gid;
-       usbp->st_rdev = sbp->st_rdev;
-#ifndef _POSIX_SOURCE
-       usbp->st_atimespec.tv_sec = sbp->st_atimespec.tv_sec;
-       usbp->st_atimespec.tv_nsec = sbp->st_atimespec.tv_nsec;
-       usbp->st_mtimespec.tv_sec = sbp->st_mtimespec.tv_sec;
-       usbp->st_mtimespec.tv_nsec = sbp->st_mtimespec.tv_nsec;
-       usbp->st_ctimespec.tv_sec = sbp->st_ctimespec.tv_sec;
-       usbp->st_ctimespec.tv_nsec = sbp->st_ctimespec.tv_nsec;
-#else
-       usbp->st_atime = sbp->st_atime;
-       usbp->st_atimensec = sbp->st_atimensec;
-       usbp->st_mtime = sbp->st_mtime;
-       usbp->st_mtimensec = sbp->st_mtimensec;
-       usbp->st_ctime = sbp->st_ctime;
-       usbp->st_ctimensec = sbp->st_ctimensec;
-#endif
-       usbp->st_size = sbp->st_size;
-       usbp->st_blocks = sbp->st_blocks;
-       usbp->st_blksize = sbp->st_blksize;
-       usbp->st_flags = sbp->st_flags;
-       usbp->st_gen = sbp->st_gen;
-       usbp->st_lspare = sbp->st_lspare;
-       usbp->st_qspare[0] = sbp->st_qspare[0];
-       usbp->st_qspare[1] = sbp->st_qspare[1];
+       return (error);
 }