]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/hfs/hfs_vfsops.c
xnu-1228.7.58.tar.gz
[apple/xnu.git] / bsd / hfs / hfs_vfsops.c
index 513f49ca6b7fff71fb12bef0f6fb62081b351659..7b67b6686ddbac8b27fc33c0b55cb3509814208d 100644 (file)
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 1999-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2008 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1991, 1993, 1994
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kauth.h>
 
 #include <sys/ubc.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
+#include <sys/ubc_internal.h>
+#include <sys/vnode_internal.h>
+#include <sys/mount_internal.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
-#include <sys/lock.h>
 #include <sys/quota.h>
 #include <sys/disk.h>
+#include <sys/paths.h>
+#include <sys/utfconv.h>
+#include <sys/kdebug.h>
+#include <sys/fslog.h>
+
+#include <kern/locks.h>
 
-// XXXdbg
 #include <vfs/vfs_journal.h>
 
 #include <miscfs/specfs/specdev.h>
 #include "hfs_cnode.h"
 #include "hfs_dbg.h"
 #include "hfs_endian.h"
+#include "hfs_hotfiles.h"
 #include "hfs_quota.h"
 
 #include "hfscommon/headers/FileMgrInternal.h"
 #include "hfscommon/headers/BTreesInternal.h"
 
-
 #if    HFS_DIAGNOSTIC
 int hfs_dbg_all = 0;
 int hfs_dbg_err = 0;
 #endif
 
 
-extern struct vnodeopv_desc hfs_vnodeop_opv_desc;
-
-extern void hfs_converterinit(void);
-
-extern void inittodr( time_t base);
+lck_grp_attr_t *  hfs_group_attr;
+lck_attr_t *  hfs_lock_attr;
+lck_grp_t *  hfs_mutex_group;
+lck_grp_t *  hfs_rwlock_group;
 
-
-static int hfs_changefs __P((struct mount *mp, struct hfs_mount_args *args,
-               struct proc *p));
-static int hfs_reload __P((struct mount *mp, struct ucred *cred, struct proc *p));
-
-static int hfs_mountfs __P((struct vnode *devvp, struct mount *mp, struct proc *p,
-               struct hfs_mount_args *args));
-static int hfs_statfs __P((struct mount *mp, register struct statfs *sbp,
-               struct proc *p));
+extern struct vnodeopv_desc hfs_vnodeop_opv_desc;
+/* not static so we can re-use in hfs_readwrite.c for build_path */
+int hfs_vfs_vget(struct mount *mp, ino64_t ino, struct vnode **vpp, vfs_context_t context);
+
+
+static int hfs_changefs(struct mount *mp, struct hfs_mount_args *args);
+static int hfs_fhtovp(struct mount *mp, int fhlen, unsigned char *fhp, struct vnode **vpp, vfs_context_t context);
+static int hfs_flushfiles(struct mount *, int, struct proc *);
+static int hfs_flushMDB(struct hfsmount *hfsmp, int waitfor, int altflush);
+static int hfs_getmountpoint(struct vnode *vp, struct hfsmount **hfsmpp);
+static int hfs_init(struct vfsconf *vfsp);
+static int hfs_mount(struct mount *mp, vnode_t  devvp, user_addr_t data, vfs_context_t context);
+static int hfs_mountfs(struct vnode *devvp, struct mount *mp, struct hfs_mount_args *args, int journal_replay_only, vfs_context_t context);
+static int hfs_reload(struct mount *mp);
+static int hfs_vfs_root(struct mount *mp, struct vnode **vpp, vfs_context_t context);
+static int hfs_quotactl(struct mount *, int, uid_t, caddr_t, vfs_context_t context);
+static int hfs_start(struct mount *mp, int flags, vfs_context_t context);
+static int hfs_statfs(struct mount *mp, register struct vfsstatfs *sbp, vfs_context_t context);
+static int hfs_sync(struct mount *mp, int waitfor, vfs_context_t context);
+static int hfs_sysctl(int *name, u_int namelen, user_addr_t oldp, size_t *oldlenp, 
+                      user_addr_t newp, size_t newlen, vfs_context_t context);
+static int hfs_unmount(struct mount *mp, int mntflags, vfs_context_t context);
+static int hfs_vptofh(struct vnode *vp, int *fhlenp, unsigned char *fhp, vfs_context_t context);
+
+static int hfs_reclaimspace(struct hfsmount *hfsmp, u_long startblk, u_long reclaimblks, vfs_context_t context);
+static int hfs_overlapped_overflow_extents(struct hfsmount *hfsmp, u_int32_t startblk,
+                                           u_int32_t catblks, u_int32_t fileID, int rsrcfork);
+static int hfs_journal_replay(const char *devnode, vfs_context_t context);
 
 
 /*
  * Called by vfs_mountroot when mounting HFS Plus as root.
  */
+
+__private_extern__
 int
-hfs_mountroot()
+hfs_mountroot(mount_t mp, vnode_t rvp, vfs_context_t context)
 {
-       extern struct vnode *rootvp;
-       struct mount *mp;
-       struct proc *p = current_proc();        /* XXX */
        struct hfsmount *hfsmp;
        ExtendedVCB *vcb;
+       struct vfsstatfs *vfsp;
        int error;
+
+       hfs_chashinit_finish();
        
-       /*
-        * Get vnode for rootdev.
-        */
-       if ((error = bdevvp(rootdev, &rootvp))) {
-               printf("hfs_mountroot: can't setup bdevvp");
+       if ((error = hfs_mountfs(rvp, mp, NULL, 0, context)))
                return (error);
-       }
-       if ((error = vfs_rootmountalloc("hfs", "root_device", &mp))) {
-               vrele(rootvp); /* release the reference from bdevvp() */
-               return (error);
-       }
-       if ((error = hfs_mountfs(rootvp, mp, p, NULL))) {
-               mp->mnt_vfc->vfc_refcount--;
-               vfs_unbusy(mp, p);
-               vrele(rootvp); /* release the reference from bdevvp() */
-               _FREE_ZONE(mp, sizeof (struct mount), M_MOUNT);
-               return (error);
-       }
-       simple_lock(&mountlist_slock);
-       CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
-       simple_unlock(&mountlist_slock);
-       
+
        /* Init hfsmp */
        hfsmp = VFSTOHFS(mp);
 
@@ -168,10 +178,9 @@ hfs_mountroot()
        vcb->reserveBlocks = ((u_int64_t)vcb->totalBlocks * HFS_MINFREE) / 100;
        vcb->reserveBlocks = MIN(vcb->reserveBlocks, HFS_MAXRESERVE / vcb->blockSize);
 
-       (void)hfs_statfs(mp, &mp->mnt_stat, p);
-       
-       vfs_unbusy(mp, p);
-       inittodr(HFSTOVCB(hfsmp)->vcbLsMod);
+       vfsp = vfs_statfs(mp);
+       (void)hfs_statfs(mp, vfsp, NULL);
+
        return (0);
 }
 
@@ -183,207 +192,278 @@ hfs_mountroot()
  */
 
 static int
-hfs_mount(mp, path, data, ndp, p)
-       register struct mount *mp;
-       char *path;
-       caddr_t data;
-       struct nameidata *ndp;
-       struct proc *p;
+hfs_mount(struct mount *mp, vnode_t devvp, user_addr_t data, vfs_context_t context)
 {
+       struct proc *p = vfs_context_proc(context);
        struct hfsmount *hfsmp = NULL;
-       struct vnode *devvp;
        struct hfs_mount_args args;
-       size_t size;
        int retval = E_NONE;
-       int flags;
-       mode_t accessmode;
-
-       if ((retval = copyin(data, (caddr_t)&args, sizeof(args))))
-               goto error_exit;
+       u_int32_t cmdflags;
 
-       /*
-        * If updating, check whether changing from read-only to
-        * read/write; if there is no device name, that's all we do.
-        */
-       if (mp->mnt_flag & MNT_UPDATE) {
-               
+       if ((retval = copyin(data, (caddr_t)&args, sizeof(args)))) {
+               return (retval);
+       }
+       cmdflags = (u_int32_t)vfs_flags(mp) & MNT_CMDFLAGS;
+       if (cmdflags & MNT_UPDATE) {
                hfsmp = VFSTOHFS(mp);
-               if ((hfsmp->hfs_fs_ronly == 0) && (mp->mnt_flag & MNT_RDONLY)) {
-               
+
+               /* Reload incore data after an fsck. */
+               if (cmdflags & MNT_RELOAD) {
+                       if (vfs_isrdonly(mp))
+                               return hfs_reload(mp);
+                       else
+                               return (EINVAL);
+               }
+
+               /* Change to a read-only file system. */
+               if (((hfsmp->hfs_flags & HFS_READ_ONLY) == 0) &&
+                   vfs_isrdonly(mp)) {
+                       int flags;
+
                        /* use VFS_SYNC to push out System (btree) files */
-                       retval = VFS_SYNC(mp, MNT_WAIT, p->p_ucred, p);
-                       if (retval && ((mp->mnt_flag & MNT_FORCE) == 0))
-                               goto error_exit;
+                       retval = VFS_SYNC(mp, MNT_WAIT, context);
+                       if (retval && ((cmdflags & MNT_FORCE) == 0))
+                               goto out;
                
                        flags = WRITECLOSE;
-                       if (mp->mnt_flag & MNT_FORCE)
+                       if (cmdflags & MNT_FORCE)
                                flags |= FORCECLOSE;
                                
                        if ((retval = hfs_flushfiles(mp, flags, p)))
-                               goto error_exit;
-                       hfsmp->hfs_fs_ronly = 1;
+                               goto out;
+                       hfsmp->hfs_flags |= HFS_READ_ONLY;
                        retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
 
                        /* also get the volume bitmap blocks */
-                       if (!retval)
-                               retval = VOP_FSYNC(hfsmp->hfs_devvp, NOCRED, MNT_WAIT, p);
-
+                       if (!retval) {
+                               if (vnode_mount(hfsmp->hfs_devvp) == mp) {
+                                       retval = hfs_fsync(hfsmp->hfs_devvp, MNT_WAIT, 0, p);
+                               } else {
+                                       vnode_get(hfsmp->hfs_devvp);
+                                       retval = VNOP_FSYNC(hfsmp->hfs_devvp, MNT_WAIT, context);
+                                       vnode_put(hfsmp->hfs_devvp);
+                               }
+                       }
                        if (retval) {
-                               hfsmp->hfs_fs_ronly = 0;
-                               goto error_exit;
+                               hfsmp->hfs_flags &= ~HFS_READ_ONLY;
+                               goto out;
+                       }
+                       if (hfsmp->jnl) {
+                           hfs_global_exclusive_lock_acquire(hfsmp);
+
+                           journal_close(hfsmp->jnl);
+                           hfsmp->jnl = NULL;
+
+                           // Note: we explicitly don't want to shutdown
+                           //       access to the jvp because we may need
+                           //       it later if we go back to being read-write.
+
+                           hfs_global_exclusive_lock_release(hfsmp);
                        }
                }
 
-               if ((mp->mnt_flag & MNT_RELOAD) &&
-                       (retval = hfs_reload(mp, ndp->ni_cnd.cn_cred, p)))
-                       goto error_exit;
+               /* Change to a writable file system. */
+               if (vfs_iswriteupgrade(mp)) {
 
-               if (hfsmp->hfs_fs_ronly && (mp->mnt_kern_flag & MNTK_WANTRDWR)) {
                        /*
-                        * If upgrade to read-write by non-root, then verify
-                        * that user has necessary permissions on the device.
+                        * On inconsistent disks, do not allow read-write mount
+                        * unless it is the boot volume being mounted.
                         */
-                       if (p->p_ucred->cr_uid != 0) {
-                               devvp = hfsmp->hfs_devvp;
-                               vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
-                               if ((retval = VOP_ACCESS(devvp, VREAD | VWRITE, p->p_ucred, p))) {
-                                       VOP_UNLOCK(devvp, 0, p);
-                                       goto error_exit;
-                               }
-                               VOP_UNLOCK(devvp, 0, p);
+                       if (!(vfs_flags(mp) & MNT_ROOTFS) &&
+                                       (hfsmp->vcbAtrb & kHFSVolumeInconsistentMask)) {
+                               retval = EINVAL;
+                               goto out;
                        }
+
+
                        retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
-       
                        if (retval != E_NONE)
-                               goto error_exit;
+                               goto out;
 
-                       /* only change hfs_fs_ronly after a successfull write */
-                       hfsmp->hfs_fs_ronly = 0;
-               }
+                       // If the journal was shut-down previously because we were
+                       // asked to be read-only, let's start it back up again now
+                       
+                       if (   (HFSTOVCB(hfsmp)->vcbAtrb & kHFSVolumeJournaledMask)
+                           && hfsmp->jnl == NULL
+                           && hfsmp->jvp != NULL) {
+                           int jflags;
+
+                           if (hfsmp->hfs_flags & HFS_NEED_JNL_RESET) {
+                                       jflags = JOURNAL_RESET;
+                           } else {
+                                       jflags = 0;
+                           }
+                           
+                           hfs_global_exclusive_lock_acquire(hfsmp);
+
+                           hfsmp->jnl = journal_open(hfsmp->jvp,
+                                                     (hfsmp->jnl_start * HFSTOVCB(hfsmp)->blockSize) + (off_t)HFSTOVCB(hfsmp)->hfsPlusIOPosOffset,
+                                                     hfsmp->jnl_size,
+                                                     hfsmp->hfs_devvp,
+                                                     hfsmp->hfs_phys_block_size,
+                                                     jflags,
+                                                     0,
+                                                     hfs_sync_metadata, hfsmp->hfs_mp);
+
+                           hfs_global_exclusive_lock_release(hfsmp);
+
+                           if (hfsmp->jnl == NULL) {
+                               retval = EINVAL;
+                               goto out;
+                           } else {
+                               hfsmp->hfs_flags &= ~HFS_NEED_JNL_RESET;
+                           }
+
+                       }
+
+                       /* Only clear HFS_READ_ONLY after a successfull write */
+                       hfsmp->hfs_flags &= ~HFS_READ_ONLY;
+
+                       if (!(hfsmp->hfs_flags & (HFS_READ_ONLY & HFS_STANDARD))) {
+                               /* Setup private/hidden directories for hardlinks. */
+                               hfs_privatedir_init(hfsmp, FILE_HARDLINKS);
+                               hfs_privatedir_init(hfsmp, DIR_HARDLINKS);
 
-               if ((hfsmp->hfs_fs_ronly == 0) &&
-                   (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)) {
-                       /* setup private/hidden directory for unlinked files */
-                       hfsmp->hfs_private_metadata_dir = FindMetaDataDirectory(HFSTOVCB(hfsmp));
-                       if (hfsmp->jnl)
                                hfs_remove_orphans(hfsmp);
-               }
 
-               if (args.fspec == 0) {
-                       /*
-                        * Process export requests.
-                        */
-                       return vfs_export(mp, &hfsmp->hfs_export, &args.export);
+                               /*
+                                * Allow hot file clustering if conditions allow.
+                                */
+                               if (hfsmp->hfs_flags & HFS_METADATA_ZONE) {
+                                       (void) hfs_recording_init(hfsmp);
+                               }
+                               /* Force ACLs on HFS+ file systems. */
+                               if (vfs_extendedsecurity(HFSTOVFS(hfsmp)) == 0) {
+                                       vfs_setextendedsecurity(HFSTOVFS(hfsmp));
+                               }
+                       }
                }
-       }
 
-       /*
-        * Not an update, or updating the name: look up the name
-        * and verify that it refers to a sensible block device.
-        */
-       NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, p);
-       retval = namei(ndp);
-       if (retval != E_NONE) {
-               DBG_ERR(("hfs_mount: CAN'T GET DEVICE: %s, %x\n", args.fspec, ndp->ni_vp->v_rdev));
-               goto error_exit;
-       }
+               /* Update file system parameters. */
+               retval = hfs_changefs(mp, &args);
 
-       devvp = ndp->ni_vp;
+       } else /* not an update request */ {
 
-       if (devvp->v_type != VBLK) {
-               vrele(devvp);
-               retval = ENOTBLK;
-               goto error_exit;
+               /* Set the mount flag to indicate that we support volfs  */
+               vfs_setflags(mp, (u_int64_t)((unsigned int)MNT_DOVOLFS));
+
+               hfs_chashinit_finish();
+
+               retval = hfs_mountfs(devvp, mp, &args, 0, context);
        }
-       if (major(devvp->v_rdev) >= nblkdev) {
-               vrele(devvp);
-               retval = ENXIO;
-               goto error_exit;
+out:
+       if (retval == 0) {
+               (void)hfs_statfs(mp, vfs_statfs(mp), context);
        }
+       return (retval);
+}
 
-       /*
-        * If mount by non-root, then verify that user has necessary
-        * permissions on the device.
-        */
-       if (p->p_ucred->cr_uid != 0) {
-               accessmode = VREAD;
-               if ((mp->mnt_flag & MNT_RDONLY) == 0)
-                       accessmode |= VWRITE;
-               vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
-               if ((retval = VOP_ACCESS(devvp, accessmode, p->p_ucred, p))) {
-                       vput(devvp);
-                       goto error_exit;
-               }
-               VOP_UNLOCK(devvp, 0, p);
-       }
 
-       if ((mp->mnt_flag & MNT_UPDATE) == 0) {
-               retval = hfs_mountfs(devvp, mp, p, &args);
-               if (retval != E_NONE)
-                       vrele(devvp);
-       } else {
-               if (devvp != hfsmp->hfs_devvp)
-                       retval = EINVAL;        /* needs translation */
-               else
-                       retval = hfs_changefs(mp, &args, p);
-               vrele(devvp);
-       }
+struct hfs_changefs_cargs {
+       struct hfsmount *hfsmp;
+        int            namefix;
+        int            permfix;
+        int            permswitch;
+};
 
-       if (retval != E_NONE) {
-               goto error_exit;
-       }
+static int
+hfs_changefs_callback(struct vnode *vp, void *cargs)
+{
+       ExtendedVCB *vcb;
+       struct cnode *cp;
+       struct cat_desc cndesc;
+       struct cat_attr cnattr;
+       struct hfs_changefs_cargs *args;
+       int lockflags;
+       int error;
 
-       /* Set the mount flag to indicate that we support volfs  */
-       mp->mnt_flag |= MNT_DOVOLFS;
-    if (VFSTOVCB(mp)->vcbSigWord == kHFSSigWord) {
-       /* HFS volumes only want roman-encoded names: */
-       mp->mnt_flag |= MNT_FIXEDSCRIPTENCODING;
-    }
-       (void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN-1, &size);
+       args = (struct hfs_changefs_cargs *)cargs;
 
-       bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
-       (void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, &size);
-       bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
-       (void)hfs_statfs(mp, &mp->mnt_stat, p);
-       return (E_NONE);
+       cp = VTOC(vp);
+       vcb = HFSTOVCB(args->hfsmp);
 
-error_exit:
+       lockflags = hfs_systemfile_lock(args->hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+       error = cat_lookup(args->hfsmp, &cp->c_desc, 0, &cndesc, &cnattr, NULL, NULL);
+       hfs_systemfile_unlock(args->hfsmp, lockflags);
+       if (error) {
+               /*
+                * If we couldn't find this guy skip to the next one
+                */
+               if (args->namefix)
+                       cache_purge(vp);
 
-       return (retval);
-}
+               return (VNODE_RETURNED);
+       }
+       /*
+        * Get the real uid/gid and perm mask from disk.
+        */
+       if (args->permswitch || args->permfix) {
+               cp->c_uid = cnattr.ca_uid;
+               cp->c_gid = cnattr.ca_gid;
+               cp->c_mode = cnattr.ca_mode;
+       }
+       /*
+        * If we're switching name converters then...
+        *   Remove the existing entry from the namei cache.
+        *   Update name to one based on new encoder.
+        */
+       if (args->namefix) {
+               cache_purge(vp);
+               replace_desc(cp, &cndesc);
 
+               if (cndesc.cd_cnid == kHFSRootFolderID) {
+                       strlcpy((char *)vcb->vcbVN, (const char *)cp->c_desc.cd_nameptr, NAME_MAX+1);
+                       cp->c_desc.cd_encoding = args->hfsmp->hfs_encoding;
+               }
+       } else {
+               cat_releasedesc(&cndesc);
+       }
+       return (VNODE_RETURNED);
+}
 
 /* Change fs mount parameters */
 static int
-hfs_changefs(mp, args, p)
-       struct mount *mp;
-       struct hfs_mount_args *args;
-       struct proc *p;
+hfs_changefs(struct mount *mp, struct hfs_mount_args *args)
 {
        int retval = 0;
        int namefix, permfix, permswitch;
        struct hfsmount *hfsmp;
-       struct cnode *cp;
        ExtendedVCB *vcb;
-       register struct vnode *vp, *nvp;
        hfs_to_unicode_func_t   get_unicode_func;
        unicode_to_hfs_func_t   get_hfsname_func;
-       struct cat_desc cndesc;
-       struct cat_attr cnattr;
-       u_long old_encoding;
+       u_long old_encoding = 0;
+       struct hfs_changefs_cargs cargs;
+       u_int32_t mount_flags;
 
        hfsmp = VFSTOHFS(mp);
        vcb = HFSTOVCB(hfsmp);
-       permswitch = (((hfsmp->hfs_unknownpermissions != 0) && ((mp->mnt_flag & MNT_UNKNOWNPERMISSIONS) == 0)) ||
-                                       ((hfsmp->hfs_unknownpermissions == 0) && ((mp->mnt_flag & MNT_UNKNOWNPERMISSIONS) != 0)));
+       mount_flags = (unsigned int)vfs_flags(mp);
+
+       permswitch = (((hfsmp->hfs_flags & HFS_UNKNOWN_PERMS) &&
+                      ((mount_flags & MNT_UNKNOWNPERMISSIONS) == 0)) ||
+                     (((hfsmp->hfs_flags & HFS_UNKNOWN_PERMS) == 0) &&
+                      (mount_flags & MNT_UNKNOWNPERMISSIONS)));
+
        /* The root filesystem must operate with actual permissions: */
-       if (permswitch && (mp->mnt_flag & MNT_ROOTFS) && (mp->mnt_flag & MNT_UNKNOWNPERMISSIONS)) {
-               mp->mnt_flag &= ~MNT_UNKNOWNPERMISSIONS;        /* Just say "No". */
+       if (permswitch && (mount_flags & MNT_ROOTFS) && (mount_flags & MNT_UNKNOWNPERMISSIONS)) {
+               vfs_clearflags(mp, (u_int64_t)((unsigned int)MNT_UNKNOWNPERMISSIONS));  /* Just say "No". */
                return EINVAL;
-       };              
-       hfsmp->hfs_unknownpermissions = ((mp->mnt_flag & MNT_UNKNOWNPERMISSIONS) != 0);
-       namefix =  permfix = 0;
+       }
+       if (mount_flags & MNT_UNKNOWNPERMISSIONS)
+               hfsmp->hfs_flags |= HFS_UNKNOWN_PERMS;
+       else
+               hfsmp->hfs_flags &= ~HFS_UNKNOWN_PERMS;
 
+       namefix = permfix = 0;
+
+       /*
+        * Tracking of hot files requires up-to-date access times.  So if
+        * access time updates are disabled, we must also disable hot files.
+        */
+       if (mount_flags & MNT_NOATIME) {
+               (void) hfs_recording_suspend(hfsmp);
+       }
+       
        /* Change the timezone (Note: this affects all hfs volumes and hfs+ volume create dates) */
        if (args->hfs_timezone.tz_minuteswest != VNOVAL) {
                gTimeZone = args->hfs_timezone;
@@ -392,12 +472,12 @@ hfs_changefs(mp, args, p)
        /* Change the default uid, gid and/or mask */
        if ((args->hfs_uid != (uid_t)VNOVAL) && (hfsmp->hfs_uid != args->hfs_uid)) {
                hfsmp->hfs_uid = args->hfs_uid;
-               if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)
+               if (vcb->vcbSigWord == kHFSPlusSigWord)
                        ++permfix;
        }
        if ((args->hfs_gid != (gid_t)VNOVAL) && (hfsmp->hfs_gid != args->hfs_gid)) {
                hfsmp->hfs_gid = args->hfs_gid;
-               if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)
+               if (vcb->vcbSigWord == kHFSPlusSigWord)
                        ++permfix;
        }
        if (args->hfs_mask != (mode_t)VNOVAL) {
@@ -406,14 +486,14 @@ hfs_changefs(mp, args, p)
                        hfsmp->hfs_file_mask = args->hfs_mask & ALLPERMS;
                        if ((args->flags != VNOVAL) && (args->flags & HFSFSMNT_NOXONFILES))
                                hfsmp->hfs_file_mask = (args->hfs_mask & DEFFILEMODE);
-                       if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)
+                       if (vcb->vcbSigWord == kHFSPlusSigWord)
                                ++permfix;
                }
        }
        
        /* Change the hfs encoding value (hfs only) */
-       if ((HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord)        &&
-           (hfsmp->hfs_encoding != (u_long)VNOVAL)             &&
+       if ((vcb->vcbSigWord == kHFSSigWord)    &&
+           (args->hfs_encoding != (u_long)VNOVAL)              &&
            (hfsmp->hfs_encoding != args->hfs_encoding)) {
 
                retval = hfs_getconverter(args->hfs_encoding, &get_unicode_func, &get_hfsname_func);
@@ -439,76 +519,31 @@ hfs_changefs(mp, args, p)
        if (!(namefix || permfix || permswitch))
                goto exit;
 
+       /* XXX 3762912 hack to support HFS filesystem 'owner' */
+       if (permfix)
+               vfs_setowner(mp,
+                   hfsmp->hfs_uid == UNKNOWNUID ? KAUTH_UID_NONE : hfsmp->hfs_uid,
+                   hfsmp->hfs_gid == UNKNOWNGID ? KAUTH_GID_NONE : hfsmp->hfs_gid);
+       
        /*
         * For each active vnode fix things that changed
         *
         * Note that we can visit a vnode more than once
         * and we can race with fsync.
+        *
+        * hfs_changefs_callback will be called for each vnode
+        * hung off of this mount point
+        *
+        * The vnode will be properly referenced and unreferenced 
+        * around the callback
         */
-       simple_lock(&mntvnode_slock);
-loop:
-       for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) {
-               /*
-                * If the vnode that we are about to fix is no longer
-                * associated with this mount point, start over.
-                */
-               if (vp->v_mount != mp)
-                   goto loop;
-        
-               simple_lock(&vp->v_interlock);
-               nvp = vp->v_mntvnodes.le_next;
-               if (vp->v_flag & VSYSTEM) {
-                       simple_unlock(&vp->v_interlock);
-                       continue;
-               }
-               simple_unlock(&mntvnode_slock);
-               retval = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, p);
-               if (retval) {
-                   simple_lock(&mntvnode_slock);
-                   if (retval == ENOENT)
-                       goto loop;
-                   continue;
-               }
-       
-               cp = VTOC(vp);
-
-               retval = cat_lookup(hfsmp, &cp->c_desc, 0, &cndesc, &cnattr, NULL);
-               /* If we couldn't find this guy skip to the next one */
-               if (retval) {
-                       if (namefix)
-                               cache_purge(vp);
-                       vput(vp);
-                       simple_lock(&mntvnode_slock);
-                       continue;
-               }
+       cargs.hfsmp = hfsmp;
+       cargs.namefix = namefix;
+       cargs.permfix = permfix;
+       cargs.permswitch = permswitch;
 
-               if (permswitch || permfix) {
-                       cp->c_uid = cnattr.ca_uid;
-                       cp->c_gid = cnattr.ca_gid;
-                       cp->c_mode = cnattr.ca_mode;
-               }
-               
-               /*
-                * If we're switching name converters then...
-                *   Remove the existing entry from the namei cache.
-                *   Update name to one based on new encoder.
-                */
-               if (namefix) {
-                       cache_purge(vp);
-                       replace_desc(cp, &cndesc);
-
-                       if (cndesc.cd_cnid == kHFSRootFolderID) {
-                               strncpy(vcb->vcbVN, cp->c_desc.cd_nameptr, NAME_MAX);
-                               cp->c_desc.cd_encoding = hfsmp->hfs_encoding;
-                       }
-               } else {
-                       cat_releasedesc(&cndesc);
-               }
-               vput(vp);
-               simple_lock(&mntvnode_slock);
+       vnode_iterate(mp, 0, hfs_changefs_callback, (void *)&cargs);
 
-       } /* end for (vp...) */
-       simple_unlock(&mntvnode_slock);
        /*
         * If we're switching name converters we can now
         * connect the new hfs_get_hfsname converter and
@@ -524,6 +559,54 @@ exit:
 }
 
 
+struct hfs_reload_cargs {
+       struct hfsmount *hfsmp;
+        int            error;
+};
+
+static int
+hfs_reload_callback(struct vnode *vp, void *cargs)
+{
+       struct cnode *cp;
+       struct hfs_reload_cargs *args;
+       int lockflags;
+
+       args = (struct hfs_reload_cargs *)cargs;
+       /*
+        * flush all the buffers associated with this node
+        */
+       (void) buf_invalidateblks(vp, 0, 0, 0);
+
+       cp = VTOC(vp);
+       /* 
+        * Remove any directory hints
+        */
+       if (vnode_isdir(vp))
+               hfs_reldirhints(cp, 0);
+
+       /*
+        * Re-read cnode data for all active vnodes (non-metadata files).
+        */
+       if (!vnode_issystem(vp) && !VNODE_IS_RSRC(vp)) {
+               struct cat_fork *datafork;
+               struct cat_desc desc;
+
+               datafork = cp->c_datafork ? &cp->c_datafork->ff_data : NULL;
+
+               /* lookup by fileID since name could have changed */
+               lockflags = hfs_systemfile_lock(args->hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+               args->error = cat_idlookup(args->hfsmp, cp->c_fileid, 0, &desc, &cp->c_attr, datafork);
+               hfs_systemfile_unlock(args->hfsmp, lockflags);
+               if (args->error) {
+                       return (VNODE_RETURNED_DONE);
+               }
+
+               /* update cnode's catalog descriptor */
+               (void) replace_desc(cp, &desc);
+       }
+       return (VNODE_RETURNED);
+}
+
 /*
  * Reload all incore data for a filesystem (used after running fsck on
  * the root filesystem and finding things to fix). The filesystem must
@@ -539,13 +622,9 @@ exit:
  *     re-read cnode data for all active vnodes.
  */
 static int
-hfs_reload(mountp, cred, p)
-       register struct mount *mountp;
-       struct ucred *cred;
-       struct proc *p;
+hfs_reload(struct mount *mountp)
 {
-       register struct vnode *vp, *nvp, *devvp;
-       struct cnode *cp;
+       register struct vnode *devvp;
        struct buf *bp;
        int sectorsize;
        int error, i;
@@ -554,9 +633,7 @@ hfs_reload(mountp, cred, p)
        ExtendedVCB *vcb;
        struct filefork *forkp;
        struct cat_desc cndesc;
-
-       if ((mountp->mnt_flag & MNT_RDONLY) == 0)
-               return (EINVAL);
+       struct hfs_reload_cargs args;
 
        hfsmp = VFSTOHFS(mountp);
        vcb = HFSTOVCB(hfsmp);
@@ -568,87 +645,51 @@ hfs_reload(mountp, cred, p)
         * Invalidate all cached meta-data.
         */
        devvp = hfsmp->hfs_devvp;
-       if (vinvalbuf(devvp, 0, cred, p, 0, 0))
+       if (buf_invalidateblks(devvp, 0, 0, 0))
                panic("hfs_reload: dirty1");
-       InvalidateCatalogCache(vcb);
-
-loop:
-       simple_lock(&mntvnode_slock);
-       for (vp = mountp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) {
-               if (vp->v_mount != mountp) {
-                       simple_unlock(&mntvnode_slock);
-                       goto loop;
-               }
-               nvp = vp->v_mntvnodes.le_next;
-
-               /*
-                * Invalidate all inactive vnodes.
-                */
-               if (vrecycle(vp, &mntvnode_slock, p))
-                       goto loop;
-
-               /*
-                * Invalidate all cached file data.
-                */
-               simple_lock(&vp->v_interlock);
-               simple_unlock(&mntvnode_slock);
-               if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, p)) {
-                       goto loop;
-               }
-               if (vinvalbuf(vp, 0, cred, p, 0, 0))
-                       panic("hfs_reload: dirty2");
-
-               /*
-                * Re-read cnode data for all active vnodes (non-metadata files).
-                */
-               cp = VTOC(vp);
-               if ((vp->v_flag & VSYSTEM) == 0 && !VNODE_IS_RSRC(vp)) {
-                       struct cat_fork *datafork;
-                       struct cat_desc desc;
-
-                       datafork = cp->c_datafork ? &cp->c_datafork->ff_data : NULL;
-
-                       /* lookup by fileID since name could have changed */
-                       if ((error = cat_idlookup(hfsmp, cp->c_fileid, &desc, &cp->c_attr, datafork))) {
-                               vput(vp);
-                               return (error);
-                       }
 
+       args.hfsmp = hfsmp;
+       args.error = 0;
+       /*
+        * hfs_reload_callback will be called for each vnode
+        * hung off of this mount point that can't be recycled...
+        * vnode_iterate will recycle those that it can (the VNODE_RELOAD option)
+        * the vnode will be in an 'unbusy' state (VNODE_WAIT) and 
+        * properly referenced and unreferenced around the callback
+        */
+       vnode_iterate(mountp, VNODE_RELOAD | VNODE_WAIT, hfs_reload_callback, (void *)&args);
 
-                       /* update cnode's catalog descriptor */
-                       (void) replace_desc(cp, &desc);
-               }
-               vput(vp);
-               simple_lock(&mntvnode_slock);
-       }
-       simple_unlock(&mntvnode_slock);
+       if (args.error)
+               return (args.error);
 
        /*
         * Re-read VolumeHeader from disk.
         */
        sectorsize = hfsmp->hfs_phys_block_size;
 
-       error = meta_bread(hfsmp->hfs_devvp,
-                       (vcb->hfsPlusIOPosOffset / sectorsize) + HFS_PRI_SECTOR(sectorsize),
+       error = (int)buf_meta_bread(hfsmp->hfs_devvp,
+                       (daddr64_t)((vcb->hfsPlusIOPosOffset / sectorsize) + HFS_PRI_SECTOR(sectorsize)),
                        sectorsize, NOCRED, &bp);
        if (error) {
                if (bp != NULL)
-                       brelse(bp);
+                       buf_brelse(bp);
                return (error);
        }
 
-       vhp = (HFSPlusVolumeHeader *) (bp->b_data + HFS_PRI_OFFSET(sectorsize));
+       vhp = (HFSPlusVolumeHeader *) (buf_dataptr(bp) + HFS_PRI_OFFSET(sectorsize));
 
        /* Do a quick sanity check */
-       if (SWAP_BE16(vhp->signature) != kHFSPlusSigWord ||
-           SWAP_BE16(vhp->version) != kHFSPlusVersion   ||
+       if ((SWAP_BE16(vhp->signature) != kHFSPlusSigWord &&
+            SWAP_BE16(vhp->signature) != kHFSXSigWord) ||
+           (SWAP_BE16(vhp->version) != kHFSPlusVersion &&
+            SWAP_BE16(vhp->version) != kHFSXVersion) ||
            SWAP_BE32(vhp->blockSize) != vcb->blockSize) {
-               brelse(bp);
+               buf_brelse(bp);
                return (EIO);
        }
 
        vcb->vcbLsMod           = to_bsd_time(SWAP_BE32(vhp->modifyDate));
-       vcb->vcbAtrb            = (UInt16) SWAP_BE32 (vhp->attributes); /* VCB only uses lower 16 bits */
+       vcb->vcbAtrb            = SWAP_BE32 (vhp->attributes);
        vcb->vcbJinfoBlock  = SWAP_BE32(vhp->journalInfoBlock);
        vcb->vcbClpSiz          = SWAP_BE32 (vhp->rsrcClumpSize);
        vcb->vcbNxtCNID         = SWAP_BE32 (vhp->nextCatalogID);
@@ -656,7 +697,7 @@ loop:
        vcb->vcbWrCnt           = SWAP_BE32 (vhp->writeCount);
        vcb->vcbFilCnt          = SWAP_BE32 (vhp->fileCount);
        vcb->vcbDirCnt          = SWAP_BE32 (vhp->folderCount);
-       vcb->nextAllocation     = SWAP_BE32 (vhp->nextAllocation);
+       HFS_UPDATE_NEXT_ALLOCATION(vcb, SWAP_BE32 (vhp->nextAllocation));
        vcb->totalBlocks        = SWAP_BE32 (vhp->totalBlocks);
        vcb->freeBlocks         = SWAP_BE32 (vhp->freeBlocks);
        vcb->encodingsBitmap    = SWAP_BE64 (vhp->encodingsBitmap);
@@ -689,6 +730,18 @@ loop:
        forkp->ff_blocks    = SWAP_BE32 (vhp->catalogFile.totalBlocks);
        forkp->ff_clumpsize = SWAP_BE32 (vhp->catalogFile.clumpSize);
 
+       if (hfsmp->hfs_attribute_vp) {
+               forkp = VTOF(hfsmp->hfs_attribute_vp);
+               for (i = 0; i < kHFSPlusExtentDensity; i++) {
+                       forkp->ff_extents[i].startBlock =
+                               SWAP_BE32 (vhp->attributesFile.extents[i].startBlock);
+                       forkp->ff_extents[i].blockCount =
+                               SWAP_BE32 (vhp->attributesFile.extents[i].blockCount);
+               }
+               forkp->ff_size      = SWAP_BE64 (vhp->attributesFile.logicalSize);
+               forkp->ff_blocks    = SWAP_BE32 (vhp->attributesFile.totalBlocks);
+               forkp->ff_clumpsize = SWAP_BE32 (vhp->attributesFile.clumpSize);
+       }
 
        forkp = VTOF((struct vnode *)vcb->allocationsRefNum);
        for (i = 0; i < kHFSPlusExtentDensity; i++) {
@@ -701,162 +754,86 @@ loop:
        forkp->ff_blocks    = SWAP_BE32 (vhp->allocationFile.totalBlocks);
        forkp->ff_clumpsize = SWAP_BE32 (vhp->allocationFile.clumpSize);
 
-       brelse(bp);
+       buf_brelse(bp);
        vhp = NULL;
 
        /*
         * Re-load B-tree header data
         */
        forkp = VTOF((struct vnode *)vcb->extentsRefNum);
-       if (error = MacToVFSError( BTReloadData((FCB*)forkp) ))
+       if ( (error = MacToVFSError( BTReloadData((FCB*)forkp) )) )
                return (error);
 
        forkp = VTOF((struct vnode *)vcb->catalogRefNum);
-       if (error = MacToVFSError( BTReloadData((FCB*)forkp) ))
+       if ( (error = MacToVFSError( BTReloadData((FCB*)forkp) )) )
                return (error);
 
+       if (hfsmp->hfs_attribute_vp) {
+               forkp = VTOF(hfsmp->hfs_attribute_vp);
+               if ( (error = MacToVFSError( BTReloadData((FCB*)forkp) )) )
+                       return (error);
+       }
+
        /* Reload the volume name */
-       if ((error = cat_idlookup(hfsmp, kHFSRootFolderID, &cndesc, NULL, NULL)))
+       if ((error = cat_idlookup(hfsmp, kHFSRootFolderID, 0, &cndesc, NULL, NULL)))
                return (error);
        vcb->volumeNameEncodingHint = cndesc.cd_encoding;
        bcopy(cndesc.cd_nameptr, vcb->vcbVN, min(255, cndesc.cd_namelen));
        cat_releasedesc(&cndesc);
 
-       /* Re-establish private/hidden directory for unlinked files */
-       hfsmp->hfs_private_metadata_dir = FindMetaDataDirectory(vcb);
+       /* Re-establish private/hidden directories. */
+       hfs_privatedir_init(hfsmp, FILE_HARDLINKS);
+       hfs_privatedir_init(hfsmp, DIR_HARDLINKS);
 
+       /* In case any volume information changed to trigger a notification */
+       hfs_generate_volume_notifications(hfsmp);
+    
        return (0);
 }
 
 
-static int
-get_raw_device(char *fspec, int is_user, int ronly, struct vnode **rvp, struct ucred *cred, struct proc *p)
-{
-       char            *rawbuf;
-       char            *dp;
-       size_t           namelen;
-       struct nameidata nd;
-       int               retval;
-
-       *rvp = NULL;
-
-       MALLOC(rawbuf, char *, MAXPATHLEN, M_HFSMNT, M_WAITOK);
-       if (rawbuf == NULL) {
-               retval = ENOMEM;
-               goto error_exit;
-       }
-
-       if (is_user) {
-               retval = copyinstr(fspec, rawbuf, MAXPATHLEN - 1, &namelen);
-               if (retval != E_NONE) {
-                       FREE(rawbuf, M_HFSMNT);
-                       goto error_exit;
-               }
-       } else {
-               strcpy(rawbuf, fspec);
-               namelen = strlen(rawbuf);
-       }
-
-       /* make sure it's null terminated */
-       rawbuf[MAXPATHLEN-1] = '\0';   
-
-       dp = &rawbuf[namelen-1];
-       while(dp >= rawbuf && *dp != '/') {
-               dp--;
-       }
-                       
-       if (dp != NULL) {
-               dp++;
-       } else {
-               dp = rawbuf;
-       }
-                       
-       /* make room for and insert the 'r' for the raw device */
-       memmove(dp+1, dp, strlen(dp)+1);
-       *dp = 'r';
-
-       NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, rawbuf, p);
-       retval = namei(&nd);
-       if (retval != E_NONE) {
-               DBG_ERR(("hfs_mountfs: can't open raw device for journal: %s, %x\n", rawbuf, nd.ni_vp->v_rdev));
-               FREE(rawbuf, M_HFSMNT);
-               goto error_exit;
-       }
-
-       *rvp = nd.ni_vp;
-       if ((retval = VOP_OPEN(*rvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p))) {
-               *rvp = NULL;
-               goto error_exit;
-       }
-
-       // don't need this any more
-       FREE(rawbuf, M_HFSMNT);
-
-       return 0;
-
-  error_exit:
-       if (*rvp) {
-           (void)VOP_CLOSE(*rvp, ronly ? FREAD : FREAD|FWRITE, cred, p);
-       }
-
-       if (rawbuf) {
-               FREE(rawbuf, M_HFSMNT);
-       }
-       return retval;
-}
-
-
-
 /*
  * Common code for mount and mountroot
  */
 static int
-hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
-       struct hfs_mount_args *args)
+hfs_mountfs(struct vnode *devvp, struct mount *mp, struct hfs_mount_args *args,
+            int journal_replay_only, vfs_context_t context)
 {
+       struct proc *p = vfs_context_proc(context);
        int retval = E_NONE;
        struct hfsmount *hfsmp;
        struct buf *bp;
        dev_t dev;
        HFSMasterDirectoryBlock *mdbp;
        int ronly;
+#if QUOTA
        int i;
+#endif
        int mntwrapper;
-       struct ucred *cred;
+       kauth_cred_t cred;
        u_int64_t disksize;
-       u_int64_t blkcnt;
+       daddr64_t blkcnt;
        u_int32_t blksize;
        u_int32_t minblksize;
        u_int32_t iswritable;
-       daddr_t   mdb_offset;
+       daddr64_t mdb_offset;
+       int isvirtual = 0;
 
-       dev = devvp->v_rdev;
-       cred = p ? p->p_ucred : NOCRED;
+       ronly = vfs_isrdonly(mp);
+       dev = vnode_specrdev(devvp);
+       cred = p ? vfs_context_ucred(context) : NOCRED;
        mntwrapper = 0;
-    /*
-     * Disallow multiple mounts of the same device.
-     * Disallow mounting of a device that is currently in use
-     * (except for root, which might share swap device for miniroot).
-     * Flush out any old buffers remaining from a previous use.
-     */
-    if ((retval = vfs_mountedon(devvp)))
-        return (retval);
-    if ((vcount(devvp) > 1) && (devvp != rootvp))
-                return (EBUSY);
-    if ((retval = vinvalbuf(devvp, V_SAVE, cred, p, 0, 0)))
-        return (retval);
-
-    ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
-    if ((retval = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p)))
-        return (retval);
 
        bp = NULL;
        hfsmp = NULL;
        mdbp = NULL;
        minblksize = kHFSBlockSize;
 
+       /* Advisory locking should be handled at the VFS layer */
+       vfs_setlocklocal(mp);
+
        /* Get the real physical block size. */
-       if (VOP_IOCTL(devvp, DKIOCGETBLOCKSIZE, (caddr_t)&blksize, 0, cred, p)) {
+       if (VNOP_IOCTL(devvp, DKIOCGETBLOCKSIZE, (caddr_t)&blksize, 0, context)) {
                retval = ENXIO;
                goto error_exit;
        }
@@ -864,90 +841,96 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
        if (blksize > 512) {
                u_int32_t size512 = 512;
 
-               if (VOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&size512, FWRITE, cred, p)) {
+               if (VNOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&size512, FWRITE, context)) {
                        retval = ENXIO;
                        goto error_exit;
                }
        }
        /* Get the number of 512 byte physical blocks. */
-       if (VOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, cred, p)) {
+       if (VNOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, context)) {
+               /* resetting block size may fail if getting block count did */
+               (void)VNOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&blksize, FWRITE, context);
+
                retval = ENXIO;
                goto error_exit;
        }
        /* Compute an accurate disk size (i.e. within 512 bytes) */
-       disksize = blkcnt * (u_int64_t)512;
+       disksize = (u_int64_t)blkcnt * (u_int64_t)512;
 
        /*
-        * There are only 31 bits worth of block count in
-        * the buffer cache.  So for large volumes a 4K
-        * physical block size is needed.
+        * On Tiger it is not necessary to switch the device 
+        * block size to be 4k if there are more than 31-bits
+        * worth of blocks but to insure compatibility with
+        * pre-Tiger systems we have to do it.
         */
-       if (blkcnt > (u_int64_t)0x000000007fffffff) {
+       if (blkcnt > 0x000000007fffffff) {
                minblksize = blksize = 4096;
        }
-       /* Now switch to our prefered physical block size. */
+       
+       /* Now switch to our preferred physical block size. */
        if (blksize > 512) {
-               if (VOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&blksize, FWRITE, cred, p)) {
+               if (VNOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&blksize, FWRITE, context)) {
                        retval = ENXIO;
                        goto error_exit;
                }
                /* Get the count of physical blocks. */
-               if (VOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, cred, p)) {
+               if (VNOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, context)) {
                        retval = ENXIO;
                        goto error_exit;
                }
        }
-
        /*
         * At this point:
         *   minblksize is the minimum physical block size
-        *   blksize has our prefered physical block size
+        *   blksize has our preferred physical block size
         *   blkcnt has the total number of physical blocks
         */
-       devvp->v_specsize = blksize;
-
-       /* cache the IO attributes */
-       if ((retval = vfs_init_io_attributes(devvp, mp))) {
-               printf("hfs_mountfs: vfs_init_io_attributes returned %d\n",
-                       retval);
-               return (retval);
-       }
 
-       mdb_offset = HFS_PRI_SECTOR(blksize);
-       if ((retval = meta_bread(devvp, HFS_PRI_SECTOR(blksize), blksize, cred, &bp))) {
+       mdb_offset = (daddr64_t)HFS_PRI_SECTOR(blksize);
+       if ((retval = (int)buf_meta_bread(devvp, mdb_offset, blksize, cred, &bp))) {
                goto error_exit;
        }
        MALLOC(mdbp, HFSMasterDirectoryBlock *, kMDBSize, M_TEMP, M_WAITOK);
-       bcopy(bp->b_data + HFS_PRI_OFFSET(blksize), mdbp, kMDBSize);
-       brelse(bp);
+       bcopy((char *)buf_dataptr(bp) + HFS_PRI_OFFSET(blksize), mdbp, kMDBSize);
+       buf_brelse(bp);
        bp = NULL;
 
        MALLOC(hfsmp, struct hfsmount *, sizeof(struct hfsmount), M_HFSMNT, M_WAITOK);
        bzero(hfsmp, sizeof(struct hfsmount));
-
-       simple_lock_init(&hfsmp->hfs_renamelock);
        
        /*
-       *  Init the volume information structure
-       */
-       mp->mnt_data = (qaddr_t)hfsmp;
+        *  Init the volume information structure
+        */
+       
+       lck_mtx_init(&hfsmp->hfs_mutex, hfs_mutex_group, hfs_lock_attr);
+       lck_mtx_init(&hfsmp->hfc_mutex, hfs_mutex_group, hfs_lock_attr);
+       lck_rw_init(&hfsmp->hfs_global_lock, hfs_rwlock_group, hfs_lock_attr);
+       lck_rw_init(&hfsmp->hfs_insync, hfs_rwlock_group, hfs_lock_attr);
+
+       vfs_setfsprivate(mp, hfsmp);
        hfsmp->hfs_mp = mp;                     /* Make VFSTOHFS work */
-       hfsmp->hfs_vcb.vcb_hfsmp = hfsmp;       /* Make VCBTOHFS work */
-       hfsmp->hfs_raw_dev = devvp->v_rdev;
+       hfsmp->hfs_raw_dev = vnode_specrdev(devvp);
        hfsmp->hfs_devvp = devvp;
+       vnode_ref(devvp);  /* Hold a ref on the device, dropped when hfsmp is freed. */
        hfsmp->hfs_phys_block_size = blksize;
        hfsmp->hfs_phys_block_count = blkcnt;
-       hfsmp->hfs_media_writeable = 1;
-       hfsmp->hfs_fs_ronly = ronly;
-       hfsmp->hfs_unknownpermissions = ((mp->mnt_flag & MNT_UNKNOWNPERMISSIONS) != 0);
-       for (i = 0; i < MAXQUOTAS; i++)
-               hfsmp->hfs_qfiles[i].qf_vp = NULLVP;
+       hfsmp->hfs_flags |= HFS_WRITEABLE_MEDIA;
+       if (ronly)
+               hfsmp->hfs_flags |= HFS_READ_ONLY;
+       if (((unsigned int)vfs_flags(mp)) & MNT_UNKNOWNPERMISSIONS)
+               hfsmp->hfs_flags |= HFS_UNKNOWN_PERMS;
 
-       if (args) {
+#if QUOTA
+       for (i = 0; i < MAXQUOTAS; i++)
+               dqfileinit(&hfsmp->hfs_qfiles[i]);
+#endif
+
+       if (args) {
                hfsmp->hfs_uid = (args->hfs_uid == (uid_t)VNOVAL) ? UNKNOWNUID : args->hfs_uid;
                if (hfsmp->hfs_uid == 0xfffffffd) hfsmp->hfs_uid = UNKNOWNUID;
                hfsmp->hfs_gid = (args->hfs_gid == (gid_t)VNOVAL) ? UNKNOWNGID : args->hfs_gid;
                if (hfsmp->hfs_gid == 0xfffffffd) hfsmp->hfs_gid = UNKNOWNGID;
+               vfs_setowner(mp, hfsmp->hfs_uid, hfsmp->hfs_gid);                               /* tell the VFS */
                if (args->hfs_mask != (mode_t)VNOVAL) {
                        hfsmp->hfs_dir_mask = args->hfs_mask & ALLPERMS;
                        if (args->flags & HFSFSMNT_NOXONFILES) {
@@ -963,41 +946,53 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
                        mntwrapper = 1;
        } else {
                /* Even w/o explicit mount arguments, MNT_UNKNOWNPERMISSIONS requires setting up uid, gid, and mask: */
-               if (mp->mnt_flag & MNT_UNKNOWNPERMISSIONS) {
+               if (((unsigned int)vfs_flags(mp)) & MNT_UNKNOWNPERMISSIONS) {
                        hfsmp->hfs_uid = UNKNOWNUID;
                        hfsmp->hfs_gid = UNKNOWNGID;
+                       vfs_setowner(mp, hfsmp->hfs_uid, hfsmp->hfs_gid);                       /* tell the VFS */
                        hfsmp->hfs_dir_mask = UNKNOWNPERMISSIONS & ALLPERMS;            /* 0777: rwx---rwx */
                        hfsmp->hfs_file_mask = UNKNOWNPERMISSIONS & DEFFILEMODE;        /* 0666: no --x by default? */
                }
        }
 
        /* Find out if disk media is writable. */
-       if (VOP_IOCTL(devvp, DKIOCISWRITABLE, (caddr_t)&iswritable, 0, cred, p) == 0) {
+       if (VNOP_IOCTL(devvp, DKIOCISWRITABLE, (caddr_t)&iswritable, 0, context) == 0) {
                if (iswritable)
-                       hfsmp->hfs_media_writeable = 1;
+                       hfsmp->hfs_flags |= HFS_WRITEABLE_MEDIA;
                else
-                       hfsmp->hfs_media_writeable = 0;
+                       hfsmp->hfs_flags &= ~HFS_WRITEABLE_MEDIA;
        }
 
+       // record the current time at which we're mounting this volume
+       struct timeval tv;
+       microtime(&tv);
+       hfsmp->hfs_mount_time = tv.tv_sec;
+
        /* Mount a standard HFS disk */
        if ((SWAP_BE16(mdbp->drSigWord) == kHFSSigWord) &&
            (mntwrapper || (SWAP_BE16(mdbp->drEmbedSigWord) != kHFSPlusSigWord))) {
-               if (devvp == rootvp) {
+
+               /* If only journal replay is requested, exit immediately */
+               if (journal_replay_only) {
+                       retval = 0;
+                       goto error_exit;
+               }
+
+               if ((vfs_flags(mp) & MNT_ROOTFS)) {     
                        retval = EINVAL;  /* Cannot root from HFS standard disks */
                        goto error_exit;
                }
                /* HFS disks can only use 512 byte physical blocks */
                if (blksize > kHFSBlockSize) {
                        blksize = kHFSBlockSize;
-                       if (VOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&blksize, FWRITE, cred, p)) {
+                       if (VNOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&blksize, FWRITE, context)) {
                                retval = ENXIO;
                                goto error_exit;
                        }
-                       if (VOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, cred, p)) {
+                       if (VNOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, context)) {
                                retval = ENXIO;
                                goto error_exit;
                        }
-                       devvp->v_specsize = blksize;
                        hfsmp->hfs_phys_block_size = blksize;
                        hfsmp->hfs_phys_block_count = blkcnt;
                }
@@ -1040,18 +1035,16 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
                                    " a multiple of physical block size (%d);"
                                    " switching to 512\n", blksize);
                                blksize = 512;
-                               if (VOP_IOCTL(devvp, DKIOCSETBLOCKSIZE,
-                                   (caddr_t)&blksize, FWRITE, cred, p)) {
+                               if (VNOP_IOCTL(devvp, DKIOCSETBLOCKSIZE,
+                                   (caddr_t)&blksize, FWRITE, context)) {
                                        retval = ENXIO;
                                        goto error_exit;
                                }
-                               if (VOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT,
-                                   (caddr_t)&blkcnt, 0, cred, p)) {
+                               if (VNOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT,
+                                   (caddr_t)&blkcnt, 0, context)) {
                                        retval = ENXIO;
                                        goto error_exit;
                                }
-                               /* XXX do we need to call vfs_init_io_attributes again? */
-                               devvp->v_specsize = blksize;
                                /* Note: relative block count adjustment */
                                hfsmp->hfs_phys_block_count *=
                                    hfsmp->hfs_phys_block_size / blksize;
@@ -1063,12 +1056,12 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
 
                        hfsmp->hfs_phys_block_count = disksize / blksize;
        
-                       mdb_offset = (embeddedOffset / blksize) + HFS_PRI_SECTOR(blksize);
-                       retval = meta_bread(devvp, mdb_offset, blksize, cred, &bp);
+                       mdb_offset = (daddr64_t)((embeddedOffset / blksize) + HFS_PRI_SECTOR(blksize));
+                       retval = (int)buf_meta_bread(devvp, mdb_offset, blksize, cred, &bp);
                        if (retval)
                                goto error_exit;
-                       bcopy(bp->b_data + HFS_PRI_OFFSET(blksize), mdbp, 512);
-                       brelse(bp);
+                       bcopy((char *)buf_dataptr(bp) + HFS_PRI_OFFSET(blksize), mdbp, 512);
+                       buf_brelse(bp);
                        bp = NULL;
                        vhp = (HFSPlusVolumeHeader*) mdbp;
 
@@ -1077,11 +1070,24 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
                        vhp = (HFSPlusVolumeHeader*) mdbp;
                }
 
+               /*
+                * On inconsistent disks, do not allow read-write mount
+                * unless it is the boot volume being mounted.
+                */
+               if (!(vfs_flags(mp) & MNT_ROOTFS) &&
+                               (SWAP_BE32(vhp->attributes) & kHFSVolumeInconsistentMask) &&
+                               !(hfsmp->hfs_flags & HFS_READ_ONLY)) {
+                       retval = EINVAL;
+                       goto error_exit;
+               }
+
+
                // XXXdbg
                //
                hfsmp->jnl = NULL;
                hfsmp->jvp = NULL;
-               if (args != NULL && (args->flags & HFSFSMNT_EXTENDED_ARGS) && args->journal_disable) {
+               if (args != NULL && (args->flags & HFSFSMNT_EXTENDED_ARGS) && 
+                   args->journal_disable) {
                    jnl_disable = 1;
                }
                                
@@ -1102,17 +1108,64 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
                        // point as journaled.
                        //
                        if (hfs_early_journal_init(hfsmp, vhp, args, embeddedOffset, mdb_offset, mdbp, cred) == 0) {
-                               mp->mnt_flag |= MNT_JOURNALED;
+                               vfs_setflags(mp, (u_int64_t)((unsigned int)MNT_JOURNALED));
                        } else {
-                               retval = EINVAL;
-                               goto error_exit;
+                               // if the journal failed to open, then set the lastMountedVersion
+                               // to be "FSK!" which fsck_hfs will see and force the fsck instead
+                               // of just bailing out because the volume is journaled.
+                               if (!ronly) {
+                                   HFSPlusVolumeHeader *jvhp;
+
+                                   hfsmp->hfs_flags |= HFS_NEED_JNL_RESET;
+                                   
+                                   if (mdb_offset == 0) {
+                                       mdb_offset = (daddr64_t)((embeddedOffset / blksize) + HFS_PRI_SECTOR(blksize));
+                                   }
+
+                                   bp = NULL;
+                                   retval = (int)buf_meta_bread(devvp, mdb_offset, blksize, cred, &bp);
+                                   if (retval == 0) {
+                                       jvhp = (HFSPlusVolumeHeader *)(buf_dataptr(bp) + HFS_PRI_OFFSET(blksize));
+                                           
+                                       if (SWAP_BE16(jvhp->signature) == kHFSPlusSigWord || SWAP_BE16(jvhp->signature) == kHFSXSigWord) {
+                                               printf ("hfs(1): Journal replay fail.  Writing lastMountVersion as FSK!\n");
+                                           jvhp->lastMountedVersion = SWAP_BE32(kFSKMountVersion);
+                                           buf_bwrite(bp);
+                                       } else {
+                                           buf_brelse(bp);
+                                       }
+                                       bp = NULL;
+                                   } else if (bp) {
+                                       buf_brelse(bp);
+                                       // clear this so the error exit path won't try to use it
+                                       bp = NULL;
+                                   }
+                               }
+
+                               // if this isn't the root device just bail out.
+                               // If it is the root device we just continue on
+                               // in the hopes that fsck_hfs will be able to
+                               // fix any damage that exists on the volume.
+                               if ( !(vfs_flags(mp) & MNT_ROOTFS)) {
+                                   retval = EINVAL;
+                                   goto error_exit;
+                               }
                        }
                }
                // XXXdbg
        
+               /* Either the journal is replayed successfully, or there 
+                * was nothing to replay, or no journal exists.  In any case,
+                * return success.
+                */
+               if (journal_replay_only) {
+                       retval = 0;
+                       goto error_exit;
+               }
+
                (void) hfs_getconverter(0, &hfsmp->hfs_get_unicode, &hfsmp->hfs_get_hfsname);
 
-               retval = hfs_MountHFSPlusVolume(hfsmp, vhp, embeddedOffset, disksize, p, args);
+               retval = hfs_MountHFSPlusVolume(hfsmp, vhp, embeddedOffset, disksize, p, args, cred);
                /*
                 * If the backend didn't like our physical blocksize
                 * then retry with physical blocksize of 512.
@@ -1121,11 +1174,11 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
                        printf("HFS Mount: could not use physical block size "
                                "(%d) switching to 512\n", blksize);
                        blksize = 512;
-                       if (VOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&blksize, FWRITE, cred, p)) {
+                       if (VNOP_IOCTL(devvp, DKIOCSETBLOCKSIZE, (caddr_t)&blksize, FWRITE, context)) {
                                retval = ENXIO;
                                goto error_exit;
                        }
-                       if (VOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, cred, p)) {
+                       if (VNOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt, 0, context)) {
                                retval = ENXIO;
                                goto error_exit;
                        }
@@ -1134,21 +1187,132 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
                        hfsmp->hfs_phys_block_count *= hfsmp->hfs_phys_block_size / blksize;
                        hfsmp->hfs_phys_block_size = blksize;
  
+                       if (hfsmp->jnl) {
+                           // close and re-open this with the new block size
+                           journal_close(hfsmp->jnl);
+                           hfsmp->jnl = NULL;
+                           if (hfs_early_journal_init(hfsmp, vhp, args, embeddedOffset, mdb_offset, mdbp, cred) == 0) {
+                                       vfs_setflags(mp, (u_int64_t)((unsigned int)MNT_JOURNALED));
+                               } else {
+                                       // if the journal failed to open, then set the lastMountedVersion
+                                       // to be "FSK!" which fsck_hfs will see and force the fsck instead
+                                       // of just bailing out because the volume is journaled.
+                                       if (!ronly) {
+                                       HFSPlusVolumeHeader *jvhp;
+
+                                       hfsmp->hfs_flags |= HFS_NEED_JNL_RESET;
+                                   
+                                       if (mdb_offset == 0) {
+                                                       mdb_offset = (daddr64_t)((embeddedOffset / blksize) + HFS_PRI_SECTOR(blksize));
+                                       }
+
+                                               bp = NULL;
+                                       retval = (int)buf_meta_bread(devvp, mdb_offset, blksize, cred, &bp);
+                                       if (retval == 0) {
+                                                       jvhp = (HFSPlusVolumeHeader *)(buf_dataptr(bp) + HFS_PRI_OFFSET(blksize));
+                                           
+                                                       if (SWAP_BE16(jvhp->signature) == kHFSPlusSigWord || SWAP_BE16(jvhp->signature) == kHFSXSigWord) {
+                                                               printf ("hfs(2): Journal replay fail.  Writing lastMountVersion as FSK!\n");
+                                                       jvhp->lastMountedVersion = SWAP_BE32(kFSKMountVersion);
+                                                       buf_bwrite(bp);
+                                                       } else {
+                                                       buf_brelse(bp);
+                                                       }
+                                                       bp = NULL;
+                                       } else if (bp) {
+                                                       buf_brelse(bp);
+                                                       // clear this so the error exit path won't try to use it
+                                                       bp = NULL;
+                                       }
+                                       }
+
+                                       // if this isn't the root device just bail out.
+                                       // If it is the root device we just continue on
+                                       // in the hopes that fsck_hfs will be able to
+                                       // fix any damage that exists on the volume.
+                                       if ( !(vfs_flags(mp) & MNT_ROOTFS)) {
+                                       retval = EINVAL;
+                                       goto error_exit;
+                                       }
+                               }
+                       }
+
                        /* Try again with a smaller block size... */
-                       retval = hfs_MountHFSPlusVolume(hfsmp, vhp, embeddedOffset, disksize, p, args);
+                       retval = hfs_MountHFSPlusVolume(hfsmp, vhp, embeddedOffset, disksize, p, args, cred);
                }
                if (retval)
                        (void) hfs_relconverter(0);
        }
 
+       // save off a snapshot of the mtime from the previous mount
+       // (for matador).
+       hfsmp->hfs_last_mounted_mtime = hfsmp->hfs_mtime;
+
        if ( retval ) {
                goto error_exit;
        }
 
-       mp->mnt_stat.f_fsid.val[0] = (long)dev;
-       mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
-       mp->mnt_maxsymlinklen = 0;
-       devvp->v_specflags |= SI_MOUNTEDON;
+       mp->mnt_vfsstat.f_fsid.val[0] = (long)dev;
+       mp->mnt_vfsstat.f_fsid.val[1] = vfs_typenum(mp);
+       vfs_setmaxsymlen(mp, 0);
+       mp->mnt_vtable->vfc_threadsafe = TRUE;
+       mp->mnt_vtable->vfc_vfsflags |= VFC_VFSNATIVEXATTR;
+#if NAMEDSTREAMS
+       mp->mnt_kern_flag |= MNTK_NAMED_STREAMS;
+#endif
+       if (!(hfsmp->hfs_flags & HFS_STANDARD)) {
+               /* Tell VFS that we support directory hard links. */
+               mp->mnt_vtable->vfc_vfsflags |= VFC_VFSDIRLINKS;
+       } else {
+               /* HFS standard doesn't support extended readdir! */
+               mp->mnt_vtable->vfc_vfsflags &= ~VFC_VFSREADDIR_EXTENDED;
+       }
+
+       if (args) {
+               /*
+                * Set the free space warning levels for a non-root volume:
+                *
+                * Set the lower freespace limit (the level that will trigger a warning)
+                * to 5% of the volume size or 250MB, whichever is less, and the desired
+                * level (which will cancel the alert request) to 1/2 above that limit.
+                * Start looking for free space to drop below this level and generate a
+                * warning immediately if needed:
+                */
+               hfsmp->hfs_freespace_notify_warninglimit =
+                       MIN(HFS_LOWDISKTRIGGERLEVEL / HFSTOVCB(hfsmp)->blockSize,
+                               (HFSTOVCB(hfsmp)->totalBlocks / 100) * HFS_LOWDISKTRIGGERFRACTION);
+               hfsmp->hfs_freespace_notify_desiredlevel =
+                       MIN(HFS_LOWDISKSHUTOFFLEVEL / HFSTOVCB(hfsmp)->blockSize,
+                               (HFSTOVCB(hfsmp)->totalBlocks / 100) * HFS_LOWDISKSHUTOFFFRACTION);
+       } else {
+               /*
+                * Set the free space warning levels for the root volume:
+                *
+                * Set the lower freespace limit (the level that will trigger a warning)
+                * to 1% of the volume size or 50MB, whichever is less, and the desired
+                * level (which will cancel the alert request) to 2% or 75MB, whichever is less.
+                */
+               hfsmp->hfs_freespace_notify_warninglimit =
+                       MIN(HFS_ROOTLOWDISKTRIGGERLEVEL / HFSTOVCB(hfsmp)->blockSize,
+                               (HFSTOVCB(hfsmp)->totalBlocks / 100) * HFS_ROOTLOWDISKTRIGGERFRACTION);
+               hfsmp->hfs_freespace_notify_desiredlevel =
+                       MIN(HFS_ROOTLOWDISKSHUTOFFLEVEL / HFSTOVCB(hfsmp)->blockSize,
+                               (HFSTOVCB(hfsmp)->totalBlocks / 100) * HFS_ROOTLOWDISKSHUTOFFFRACTION);
+       };
+       
+       /* Check if the file system exists on virtual device, like disk image */
+       if (VNOP_IOCTL(devvp, DKIOCISVIRTUAL, (caddr_t)&isvirtual, 0, context) == 0) {
+               if (isvirtual) {
+                       hfsmp->hfs_flags |= HFS_VIRTUAL_DEVICE;
+               }
+       }
+
+       /*
+        * Start looking for free space to drop below this level and generate a
+        * warning immediately if needed:
+        */
+       hfsmp->hfs_notification_conditions = 0;
+       hfs_generate_volume_notifications(hfsmp);
 
        if (ronly == 0) {
                (void) hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
@@ -1158,17 +1322,20 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
 
 error_exit:
        if (bp)
-               brelse(bp);
+               buf_brelse(bp);
        if (mdbp)
                FREE(mdbp, M_TEMP);
-       (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, cred, p);
+
        if (hfsmp && hfsmp->jvp && hfsmp->jvp != hfsmp->hfs_devvp) {
-           (void)VOP_CLOSE(hfsmp->jvp, ronly ? FREAD : FREAD|FWRITE, cred, p);
+           (void)VNOP_CLOSE(hfsmp->jvp, ronly ? FREAD : FREAD|FWRITE, context);
                hfsmp->jvp = NULL;
        }
        if (hfsmp) {
+               if (hfsmp->hfs_devvp) {
+                       vnode_rele(hfsmp->hfs_devvp);
+               }
                FREE(hfsmp, M_HFSMNT);
-               mp->mnt_data = (qaddr_t)0;
+               vfs_setfsprivate(mp, NULL);
        }
         return (retval);
 }
@@ -1180,10 +1347,7 @@ error_exit:
  */
 /* ARGSUSED */
 static int
-hfs_start(mp, flags, p)
-       struct mount *mp;
-       int flags;
-       struct proc *p;
+hfs_start(__unused struct mount *mp, __unused int flags, __unused vfs_context_t context)
 {
        return (0);
 }
@@ -1193,16 +1357,14 @@ hfs_start(mp, flags, p)
  * unmount system call
  */
 static int
-hfs_unmount(mp, mntflags, p)
-       struct mount *mp;
-       int mntflags;
-       struct proc *p;
+hfs_unmount(struct mount *mp, int mntflags, vfs_context_t context)
 {
+       struct proc *p = vfs_context_proc(context);
        struct hfsmount *hfsmp = VFSTOHFS(mp);
        int retval = E_NONE;
        int flags;
        int force;
-       int started_tr = 0, grabbed_lock = 0;
+       int started_tr = 0;
 
        flags = 0;
        force = 0;
@@ -1214,60 +1376,81 @@ hfs_unmount(mp, mntflags, p)
        if ((retval = hfs_flushfiles(mp, flags, p)) && !force)
                return (retval);
 
+       if (hfsmp->hfs_flags & HFS_METADATA_ZONE)
+               (void) hfs_recording_suspend(hfsmp);
+
        /*
         * Flush out the b-trees, volume bitmap and Volume Header
         */
-       if (hfsmp->hfs_fs_ronly == 0) {
-               hfs_global_shared_lock_acquire(hfsmp);
-               grabbed_lock = 1;
-           if (hfsmp->jnl) {
-                       journal_start_transaction(hfsmp->jnl);
-                       started_tr = 1;
+       if ((hfsmp->hfs_flags & HFS_READ_ONLY) == 0) {
+               retval = hfs_start_transaction(hfsmp);
+               if (retval == 0) {
+                   started_tr = 1;
+               } else if (!force) {
+                   goto err_exit;
                }
-               
-               retval = VOP_FSYNC(HFSTOVCB(hfsmp)->catalogRefNum, NOCRED, MNT_WAIT, p);
+
+               if (hfsmp->hfs_startup_vp) {
+                       (void) hfs_lock(VTOC(hfsmp->hfs_startup_vp), HFS_EXCLUSIVE_LOCK);
+                       retval = hfs_fsync(hfsmp->hfs_startup_vp, MNT_WAIT, 0, p);
+                       hfs_unlock(VTOC(hfsmp->hfs_startup_vp));
+                       if (retval && !force)
+                               goto err_exit;
+               }
+
+               if (hfsmp->hfs_attribute_vp) {
+                       (void) hfs_lock(VTOC(hfsmp->hfs_attribute_vp), HFS_EXCLUSIVE_LOCK);
+                       retval = hfs_fsync(hfsmp->hfs_attribute_vp, MNT_WAIT, 0, p);
+                       hfs_unlock(VTOC(hfsmp->hfs_attribute_vp));
+                       if (retval && !force)
+                               goto err_exit;
+               }
+
+               (void) hfs_lock(VTOC(hfsmp->hfs_catalog_vp), HFS_EXCLUSIVE_LOCK);
+               retval = hfs_fsync(hfsmp->hfs_catalog_vp, MNT_WAIT, 0, p);
+               hfs_unlock(VTOC(hfsmp->hfs_catalog_vp));
                if (retval && !force)
                        goto err_exit;
                
-               retval = VOP_FSYNC(HFSTOVCB(hfsmp)->extentsRefNum, NOCRED, MNT_WAIT, p);
+               (void) hfs_lock(VTOC(hfsmp->hfs_extents_vp), HFS_EXCLUSIVE_LOCK);
+               retval = hfs_fsync(hfsmp->hfs_extents_vp, MNT_WAIT, 0, p);
+               hfs_unlock(VTOC(hfsmp->hfs_extents_vp));
                if (retval && !force)
                        goto err_exit;
                        
-               // if we have an allocation file, sync it too so we don't leave dirty
-               // blocks around
-               if (HFSTOVCB(hfsmp)->allocationsRefNum) {
-                   if (retval = VOP_FSYNC(HFSTOVCB(hfsmp)->allocationsRefNum, NOCRED, MNT_WAIT, p)) {
-                       if (!force)
-                           goto err_exit;
-                   }
+               if (hfsmp->hfs_allocation_vp) {
+                       (void) hfs_lock(VTOC(hfsmp->hfs_allocation_vp), HFS_EXCLUSIVE_LOCK);
+                       retval = hfs_fsync(hfsmp->hfs_allocation_vp, MNT_WAIT, 0, p);
+                       hfs_unlock(VTOC(hfsmp->hfs_allocation_vp));
+                       if (retval && !force)
+                               goto err_exit;
                }
 
-               if (retval = VOP_FSYNC(hfsmp->hfs_devvp, NOCRED, MNT_WAIT, p)) {
-                       if (!force)
+               if (hfsmp->hfc_filevp && vnode_issystem(hfsmp->hfc_filevp)) {
+                       retval = hfs_fsync(hfsmp->hfc_filevp, MNT_WAIT, 0, p);
+                       if (retval && !force)
                                goto err_exit;
                }
-               
-               /* See if this volume is damaged, is so do not unmount cleanly */
-               if (HFSTOVCB(hfsmp)->vcbFlags & kHFS_DamagedVolume) {
+
+               /* If runtime corruption was detected, indicate that the volume
+                * was not unmounted cleanly.
+                */
+               if (hfsmp->vcbAtrb & kHFSVolumeInconsistentMask) {
                        HFSTOVCB(hfsmp)->vcbAtrb &= ~kHFSVolumeUnmountedMask;
                } else {
                        HFSTOVCB(hfsmp)->vcbAtrb |= kHFSVolumeUnmountedMask;
                }
 
-               retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT, 1);
+               retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
                if (retval) {
                        HFSTOVCB(hfsmp)->vcbAtrb &= ~kHFSVolumeUnmountedMask;
                        if (!force)
                                goto err_exit;  /* could not flush everything */
                }
 
-               if (hfsmp->jnl) {
-                       journal_end_transaction(hfsmp->jnl);
-                       started_tr = 0;
-               }
-               if (grabbed_lock) {
-                       hfs_global_shared_lock_release(hfsmp);
-                       grabbed_lock = 0;
+               if (started_tr) {
+                   hfs_end_transaction(hfsmp);
+                   started_tr = 0;
                }
        }
 
@@ -1280,40 +1463,51 @@ hfs_unmount(mp, mntflags, p)
         */
        (void) hfsUnmount(hfsmp, p);
 
+       /*
+        * Last chance to dump unreferenced system files.
+        */
+       (void) vflush(mp, NULLVP, FORCECLOSE);
+
        if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord)
                (void) hfs_relconverter(hfsmp->hfs_encoding);
 
        // XXXdbg
        if (hfsmp->jnl) {
            journal_close(hfsmp->jnl);
+           hfsmp->jnl = NULL;
        }
 
+       VNOP_FSYNC(hfsmp->hfs_devvp, MNT_WAIT, context);
+
        if (hfsmp->jvp && hfsmp->jvp != hfsmp->hfs_devvp) {
-           retval = VOP_CLOSE(hfsmp->jvp, hfsmp->hfs_fs_ronly ? FREAD : FREAD|FWRITE,
-                              NOCRED, p);
-           vrele(hfsmp->jvp);
-               hfsmp->jvp = NULL;
+           retval = VNOP_CLOSE(hfsmp->jvp,
+                              hfsmp->hfs_flags & HFS_READ_ONLY ? FREAD : FREAD|FWRITE,
+                              context);
+           vnode_put(hfsmp->jvp);
+           hfsmp->jvp = NULL;
        }
        // XXXdbg
 
-       hfsmp->hfs_devvp->v_specflags &= ~SI_MOUNTEDON;
-       retval = VOP_CLOSE(hfsmp->hfs_devvp,
-                   hfsmp->hfs_fs_ronly ? FREAD : FREAD|FWRITE,
-                   NOCRED, p);
-       if (retval && !force)
-               return(retval);
+#ifdef HFS_SPARSE_DEV
+       /* Drop our reference on the backing fs (if any). */
+       if ((hfsmp->hfs_flags & HFS_HAS_SPARSE_DEVICE) && hfsmp->hfs_backingfs_rootvp) {
+               struct vnode * tmpvp;
 
-       vrele(hfsmp->hfs_devvp);
+               hfsmp->hfs_flags &= ~HFS_HAS_SPARSE_DEVICE;
+               tmpvp = hfsmp->hfs_backingfs_rootvp;
+               hfsmp->hfs_backingfs_rootvp = NULLVP;
+               vnode_rele(tmpvp);
+       }
+#endif /* HFS_SPARSE_DEV */
+       lck_mtx_destroy(&hfsmp->hfc_mutex, hfs_mutex_group);
+       vnode_rele(hfsmp->hfs_devvp);
        FREE(hfsmp, M_HFSMNT);
-       mp->mnt_data = (qaddr_t)0;
+
        return (0);
 
   err_exit:
-       if (hfsmp->jnl && started_tr) {
-               journal_end_transaction(hfsmp->jnl);
-       }
-       if (grabbed_lock) {
-               hfs_global_shared_lock_release(hfsmp);
+       if (started_tr) {
+               hfs_end_transaction(hfsmp);
        }
        return retval;
 }
@@ -1321,44 +1515,32 @@ hfs_unmount(mp, mntflags, p)
 
 /*
  * Return the root of a filesystem.
- *
- *              OUT - vpp, should be locked and vget()'d (to increment usecount and lock)
  */
 static int
-hfs_root(mp, vpp)
-       struct mount *mp;
-       struct vnode **vpp;
+hfs_vfs_root(struct mount *mp, struct vnode **vpp, __unused vfs_context_t context)
 {
-       struct vnode *nvp;
-       int retval;
-       UInt32 rootObjID = kRootDirID;
-
-       if ((retval = VFS_VGET(mp, &rootObjID, &nvp)))
-               return (retval);
-
-       *vpp = nvp;
-       return (0);
+       return hfs_vget(VFSTOHFS(mp), (cnid_t)kHFSRootFolderID, vpp, 1);
 }
 
 
 /*
  * Do operations associated with quotas
  */
-int
-hfs_quotactl(mp, cmds, uid, arg, p)
-       struct mount *mp;
-       int cmds;
-       uid_t uid;
-       caddr_t arg;
-       struct proc *p;
+#if !QUOTA
+static int
+hfs_quotactl(__unused struct mount *mp, __unused int cmds, __unused uid_t uid, __unused caddr_t datap, __unused vfs_context_t context)
+{
+       return (ENOTSUP);
+}
+#else
+static int
+hfs_quotactl(struct mount *mp, int cmds, uid_t uid, caddr_t datap, vfs_context_t context)
 {
+       struct proc *p = vfs_context_proc(context);
        int cmd, type, error;
 
-#if !QUOTA
-       return (EOPNOTSUPP);
-#else
-       if (uid == -1)
-               uid = p->p_cred->p_ruid;
+       if (uid == ~0U)
+               uid = vfs_context_ucred(context)->cr_ruid;
        cmd = cmds >> SUBCMDSHIFT;
 
        switch (cmd) {
@@ -1366,24 +1548,24 @@ hfs_quotactl(mp, cmds, uid, arg, p)
        case Q_QUOTASTAT:
                break;
        case Q_GETQUOTA:
-               if (uid == p->p_cred->p_ruid)
+               if (uid == vfs_context_ucred(context)->cr_ruid)
                        break;
                /* fall through */
        default:
-               if (error = suser(p->p_ucred, &p->p_acflag))
+               if ( (error = vfs_context_suser(context)) )
                        return (error);
        }
 
        type = cmds & SUBCMDMASK;
        if ((u_int)type >= MAXQUOTAS)
                return (EINVAL);
-       if (vfs_busy(mp, LK_NOWAIT, 0, p))
+       if (vfs_busy(mp, LK_NOWAIT))
                return (0);
 
        switch (cmd) {
 
        case Q_QUOTAON:
-               error = hfs_quotaon(p, mp, type, arg, UIO_USERSPACE);
+               error = hfs_quotaon(p, mp, type, datap);
                break;
 
        case Q_QUOTAOFF:
@@ -1391,15 +1573,15 @@ hfs_quotactl(mp, cmds, uid, arg, p)
                break;
 
        case Q_SETQUOTA:
-               error = hfs_setquota(mp, uid, type, arg);
+               error = hfs_setquota(mp, uid, type, datap);
                break;
 
        case Q_SETUSE:
-               error = hfs_setuse(mp, uid, type, arg);
+               error = hfs_setuse(mp, uid, type, datap);
                break;
 
        case Q_GETQUOTA:
-               error = hfs_getquota(mp, uid, type, arg);
+               error = hfs_getquota(mp, uid, type, datap);
                break;
 
        case Q_SYNC:
@@ -1407,52 +1589,66 @@ hfs_quotactl(mp, cmds, uid, arg, p)
                break;
 
        case Q_QUOTASTAT:
-               error = hfs_quotastat(mp, type, arg);
+               error = hfs_quotastat(mp, type, datap);
                break;
 
        default:
                error = EINVAL;
                break;
        }
-       vfs_unbusy(mp, p);
+       vfs_unbusy(mp);
+
        return (error);
-#endif /* QUOTA */
 }
+#endif /* QUOTA */
 
-
-
+/* Subtype is composite of bits */
+#define HFS_SUBTYPE_JOURNALED      0x01
+#define HFS_SUBTYPE_CASESENSITIVE  0x02
+/* bits 2 - 6 reserved */
+#define HFS_SUBTYPE_STANDARDHFS    0x80
 
 /*
  * Get file system statistics.
  */
 static int
-hfs_statfs(mp, sbp, p)
-       struct mount *mp;
-       register struct statfs *sbp;
-       struct proc *p;
+hfs_statfs(struct mount *mp, register struct vfsstatfs *sbp, __unused vfs_context_t context)
 {
        ExtendedVCB *vcb = VFSTOVCB(mp);
        struct hfsmount *hfsmp = VFSTOHFS(mp);
        u_long freeCNIDs;
+       u_int16_t subtype = 0;
 
        freeCNIDs = (u_long)0xFFFFFFFF - (u_long)vcb->vcbNxtCNID;
 
-       sbp->f_bsize = vcb->blockSize;
-       sbp->f_iosize = hfsmp->hfs_logBlockSize;
-       sbp->f_blocks = vcb->totalBlocks;
-       sbp->f_bfree = hfs_freeblks(hfsmp, 0);
-       sbp->f_bavail = hfs_freeblks(hfsmp, 1);
-       sbp->f_files = vcb->totalBlocks - 2;  /* max files is constrained by total blocks */
-       sbp->f_ffree = MIN(freeCNIDs, sbp->f_bavail);
-       
-       sbp->f_type = 0;
-       if (sbp != &mp->mnt_stat) {
-               sbp->f_type = mp->mnt_vfc->vfc_typenum;
-               bcopy((caddr_t)mp->mnt_stat.f_mntonname,
-                       (caddr_t)&sbp->f_mntonname[0], MNAMELEN);
-               bcopy((caddr_t)mp->mnt_stat.f_mntfromname,
-                       (caddr_t)&sbp->f_mntfromname[0], MNAMELEN);
+       sbp->f_bsize = (u_int32_t)vcb->blockSize;
+       sbp->f_iosize = (size_t)cluster_max_io_size(mp, 0);
+       sbp->f_blocks = (u_int64_t)((unsigned long)vcb->totalBlocks);
+       sbp->f_bfree = (u_int64_t)((unsigned long )hfs_freeblks(hfsmp, 0));
+       sbp->f_bavail = (u_int64_t)((unsigned long )hfs_freeblks(hfsmp, 1));
+       sbp->f_files = (u_int64_t)((unsigned long )(vcb->totalBlocks - 2));  /* max files is constrained by total blocks */
+       sbp->f_ffree = (u_int64_t)((unsigned long )(MIN(freeCNIDs, sbp->f_bavail)));
+
+       /*
+        * Subtypes (flavors) for HFS
+        *   0:   Mac OS Extended
+        *   1:   Mac OS Extended (Journaled) 
+        *   2:   Mac OS Extended (Case Sensitive) 
+        *   3:   Mac OS Extended (Case Sensitive, Journaled) 
+        *   4 - 127:   Reserved
+        * 128:   Mac OS Standard
+        * 
+        */
+       if (hfsmp->hfs_flags & HFS_STANDARD) {
+               subtype = HFS_SUBTYPE_STANDARDHFS;
+       } else /* HFS Plus */ {
+               if (hfsmp->jnl)
+                       subtype |= HFS_SUBTYPE_JOURNALED;
+               if (hfsmp->hfs_flags & HFS_CASE_SENSITIVE)
+                       subtype |= HFS_SUBTYPE_CASESENSITIVE;
        }
+       sbp->f_fssubtype = subtype;
+
        return (0);
 }
 
@@ -1470,57 +1666,81 @@ void
 hfs_sync_metadata(void *arg)
 {
        struct mount *mp = (struct mount *)arg;
-       struct cnode *cp;
        struct hfsmount *hfsmp;
        ExtendedVCB *vcb;
-       struct vnode *meta_vp[3];
-       struct buf *bp;
-       int i, sectorsize, priIDSector, altIDSector, retval;
-       int error, allerror = 0;
-
+       buf_t   bp;
+       int  sectorsize, retval;
+       daddr64_t priIDSector;
        hfsmp = VFSTOHFS(mp);
        vcb = HFSTOVCB(hfsmp);
 
-       bflushq(BQ_META, mp);
-
-
-#if 1     // XXXdbg - I do not believe this is necessary...
-          //          but if I pull it out, then the journal
-             //          does not seem to get flushed properly
-             //          when it is closed....
-       
        // now make sure the super block is flushed
        sectorsize = hfsmp->hfs_phys_block_size;
-       priIDSector = (vcb->hfsPlusIOPosOffset / sectorsize) +
-                  HFS_PRI_SECTOR(sectorsize);
-       retval = meta_bread(hfsmp->hfs_devvp, priIDSector, sectorsize, NOCRED, &bp);
-       if (retval != 0) {
-               panic("hfs: sync_metadata: can't read super-block?! (retval 0x%x, priIDSector)\n",
-                         retval, priIDSector);
+       priIDSector = (daddr64_t)((vcb->hfsPlusIOPosOffset / sectorsize) +
+                                 HFS_PRI_SECTOR(sectorsize));
+       retval = (int)buf_meta_bread(hfsmp->hfs_devvp, priIDSector, sectorsize, NOCRED, &bp);
+       if ((retval != 0 ) && (retval != ENXIO)) {
+               printf("hfs_sync_metadata: can't read volume header at %d! (retval 0x%x)\n",
+                      (int)priIDSector, retval);
        }
 
-       if (retval == 0 && (bp->b_flags & B_DELWRI) && (bp->b_flags & B_LOCKED) == 0) {
-           bwrite(bp);
+       if (retval == 0 && ((buf_flags(bp) & (B_DELWRI | B_LOCKED)) == B_DELWRI)) {
+           buf_bwrite(bp);
        } else if (bp) {
-           brelse(bp);
+           buf_brelse(bp);
        }
 
        // the alternate super block...
        // XXXdbg - we probably don't need to do this each and every time.
        //          hfs_btreeio.c:FlushAlternate() should flag when it was
        //          written...
-       altIDSector = (vcb->hfsPlusIOPosOffset / sectorsize) +
-                       HFS_ALT_SECTOR(sectorsize, hfsmp->hfs_phys_block_count);
-       retval = meta_bread(hfsmp->hfs_devvp, altIDSector, sectorsize, NOCRED, &bp);
-       if (retval == 0 && (bp->b_flags & B_DELWRI) && (bp->b_flags & B_LOCKED) == 0) {
-           bwrite(bp);
-       } else if (bp) {
-           brelse(bp);
+       if (hfsmp->hfs_alt_id_sector) {
+               retval = (int)buf_meta_bread(hfsmp->hfs_devvp, hfsmp->hfs_alt_id_sector, sectorsize, NOCRED, &bp);
+               if (retval == 0 && ((buf_flags(bp) & (B_DELWRI | B_LOCKED)) == B_DELWRI)) {
+                   buf_bwrite(bp);
+               } else if (bp) {
+                   buf_brelse(bp);
+               }
        }
-#endif
-       
 }
 
+
+struct hfs_sync_cargs {
+        kauth_cred_t cred;
+        struct proc  *p;
+        int    waitfor;
+        int    error;
+};
+
+
+static int
+hfs_sync_callback(struct vnode *vp, void *cargs)
+{
+       struct cnode *cp;
+       struct hfs_sync_cargs *args;
+       int error;
+
+       args = (struct hfs_sync_cargs *)cargs;
+
+       if (hfs_lock(VTOC(vp), HFS_EXCLUSIVE_LOCK) != 0) {
+               return (VNODE_RETURNED);
+       }
+       cp = VTOC(vp);
+
+       if ((cp->c_flag & C_MODIFIED) ||
+           (cp->c_touch_acctime | cp->c_touch_chgtime | cp->c_touch_modtime) ||
+           vnode_hasdirtyblks(vp)) {
+               error = hfs_fsync(vp, args->waitfor, 0, args->p);
+
+               if (error)
+                       args->error = error;
+       }
+       hfs_unlock(cp);
+       return (VNODE_RETURNED);
+}
+
+
+
 /*
  * Go through the disk queues to initiate sandbagged IO;
  * go through the inodes to write those that have been modified;
@@ -1529,163 +1749,103 @@ hfs_sync_metadata(void *arg)
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */
 static int
-hfs_sync(mp, waitfor, cred, p)
-       struct mount *mp;
-       int waitfor;
-       struct ucred *cred;
-       struct proc *p;
+hfs_sync(struct mount *mp, int waitfor, vfs_context_t context)
 {
-       struct vnode *nvp, *vp;
+       struct proc *p = vfs_context_proc(context);
        struct cnode *cp;
        struct hfsmount *hfsmp;
        ExtendedVCB *vcb;
-       struct vnode *meta_vp[3];
+       struct vnode *meta_vp[4];
        int i;
        int error, allerror = 0;
+       struct hfs_sync_cargs args;
 
        /*
         * During MNT_UPDATE hfs_changefs might be manipulating
         * vnodes so back off
         */
-       if (mp->mnt_flag & MNT_UPDATE)
+       if (((u_int32_t)vfs_flags(mp)) & MNT_UPDATE)    /* XXX MNT_UPDATE may not be visible here */
                return (0);
 
        hfsmp = VFSTOHFS(mp);
-       if (hfsmp->hfs_fs_ronly != 0) {
-               panic("update: rofs mod");
-       };
+       if (hfsmp->hfs_flags & HFS_READ_ONLY)
+               return (EROFS);
 
-#if 0
-       // XXXdbg first go through and flush out any modified
-       //        meta data blocks so they go out in order...
-       bflushq(BQ_META, mp);
-       bflushq(BQ_LRU,  mp);
-       // only flush locked blocks if we're not doing journaling
-       if (hfsmp->jnl == NULL) {
-           bflushq(BQ_LOCKED, mp);
-       }
-#endif
+       /* skip over frozen volumes */
+       if (!lck_rw_try_lock_shared(&hfsmp->hfs_insync))
+               return 0;
 
+       args.cred = kauth_cred_get();
+       args.waitfor = waitfor;
+       args.p = p;
+       args.error = 0;
        /*
-        * Write back each 'modified' vnode
+        * hfs_sync_callback will be called for each vnode
+        * hung off of this mount point... the vnode will be
+        * properly referenced and unreferenced around the callback
         */
+       vnode_iterate(mp, 0, hfs_sync_callback, (void *)&args);
 
-loop:
-       simple_lock(&mntvnode_slock);
-       for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) {
-                int didhold;
-               /*
-                * If the vnode that we are about to sync is no longer
-                * associated with this mount point, start over.
-                */
-               if (vp->v_mount != mp) {
-                       simple_unlock(&mntvnode_slock);
-                       goto loop;
-               }
-
-               simple_lock(&vp->v_interlock);
-               nvp = vp->v_mntvnodes.le_next;
-
-               cp = VTOC(vp);
-
-               // restart our whole search if this guy is locked
-               // or being reclaimed.
-               // XXXdbg - at some point this should go away or we
-               //          need to change all file systems to have
-               //          this same code.  vget() should never return
-               //          success if either of these conditions is
-               //          true.
-               if (vp->v_tag != VT_HFS || cp == NULL) {
-                       simple_unlock(&vp->v_interlock);
-                       continue;
-               }
-
-               if ((vp->v_flag & VSYSTEM) || (vp->v_type == VNON) ||
-                   (((cp->c_flag & (C_ACCESS | C_CHANGE | C_MODIFIED | C_UPDATE)) == 0) &&
-                   (vp->v_dirtyblkhd.lh_first == NULL) && !(vp->v_flag & VHASDIRTY))) {
-                       simple_unlock(&vp->v_interlock);
-                       simple_unlock(&mntvnode_slock);
-                       simple_lock(&mntvnode_slock);
-                       continue;
-               }
-
-               simple_unlock(&mntvnode_slock);
-               error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, p);
-               if (error) {
-                       if (error == ENOENT)
-                               goto loop;
-                       simple_lock(&mntvnode_slock);
-                       continue;
-               }
-               
-               didhold = ubc_hold(vp);
-               if ((error = VOP_FSYNC(vp, cred, waitfor, p))) {
-                       allerror = error;
-               };
-               VOP_UNLOCK(vp, 0, p);
-               if (didhold)
-                       ubc_rele(vp);
-               vrele(vp);
-               simple_lock(&mntvnode_slock);
-       };
+       if (args.error)
+               allerror = args.error;
 
        vcb = HFSTOVCB(hfsmp);
 
        meta_vp[0] = vcb->extentsRefNum;
        meta_vp[1] = vcb->catalogRefNum;
        meta_vp[2] = vcb->allocationsRefNum;  /* This is NULL for standard HFS */
+       meta_vp[3] = hfsmp->hfs_attribute_vp; /* Optional file */
 
        /* Now sync our three metadata files */
-       for (i = 0; i < 3; ++i) {
+       for (i = 0; i < 4; ++i) {
                struct vnode *btvp;
 
-               btvp = btvp = meta_vp[i];;
-               if ((btvp==0) || (btvp->v_type == VNON) || (btvp->v_mount != mp))
+               btvp = meta_vp[i];;
+               if ((btvp==0) || (vnode_mount(btvp) != mp))
                        continue;
 
-               simple_lock(&btvp->v_interlock);
+               /* XXX use hfs_systemfile_lock instead ? */
+               (void) hfs_lock(VTOC(btvp), HFS_EXCLUSIVE_LOCK);
                cp = VTOC(btvp);
-               if (((cp->c_flag & (C_ACCESS | C_CHANGE | C_MODIFIED | C_UPDATE)) == 0) &&
-                   (btvp->v_dirtyblkhd.lh_first == NULL) && !(btvp->v_flag & VHASDIRTY)) {
-                       simple_unlock(&btvp->v_interlock);
+
+               if (((cp->c_flag &  C_MODIFIED) == 0) &&
+                   (cp->c_touch_acctime == 0) &&
+                   (cp->c_touch_chgtime == 0) &&
+                   (cp->c_touch_modtime == 0) &&
+                   vnode_hasdirtyblks(btvp) == 0) {
+                       hfs_unlock(VTOC(btvp));
                        continue;
                }
-               simple_unlock(&mntvnode_slock);
-               error = vget(btvp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, p);
+               error = vnode_get(btvp);
                if (error) {
-                       simple_lock(&mntvnode_slock);
+                       hfs_unlock(VTOC(btvp));
                        continue;
                }
-               if ((error = VOP_FSYNC(btvp, cred, waitfor, p)))
+               if ((error = hfs_fsync(btvp, waitfor, 0, p)))
                        allerror = error;
-               VOP_UNLOCK(btvp, 0, p);
-               vrele(btvp);
-               simple_lock(&mntvnode_slock);
-       };
 
-       simple_unlock(&mntvnode_slock);
+               hfs_unlock(cp);
+               vnode_put(btvp);
+       };
 
        /*
         * Force stale file system control information to be flushed.
         */
        if (vcb->vcbSigWord == kHFSSigWord) {
-               if ((error = VOP_FSYNC(hfsmp->hfs_devvp, cred, waitfor, p)))
+               if ((error = VNOP_FSYNC(hfsmp->hfs_devvp, waitfor, context))) {
                        allerror = error;
+               }
        }
 #if QUOTA
        hfs_qsync(mp);
 #endif /* QUOTA */
+
+       hfs_hotfilesync(hfsmp, vfs_context_kernel());
+
        /*
         * Write back modified superblock.
         */
-
        if (IsVCBDirty(vcb)) {
-               // XXXdbg - debugging, remove
-               if (hfsmp->jnl) {
-                       //printf("hfs: sync: strange, a journaled volume w/dirty VCB? jnl 0x%x hfsmp 0x%x\n",
-                       //        hfsmp->jnl, hfsmp);
-               }
-
                error = hfs_flushvolumeheader(hfsmp, waitfor, 0);
                if (error)
                        allerror = error;
@@ -1694,8 +1854,8 @@ loop:
        if (hfsmp->jnl) {
            journal_flush(hfsmp->jnl);
        }
-       
-  err_exit:
+
+       lck_rw_unlock_shared(&hfsmp->hfs_insync);       
        return (allerror);
 }
 
@@ -1711,33 +1871,24 @@ loop:
  *   those rights via. exflagsp and credanonp
  */
 static int
-hfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
-       register struct mount *mp;
-       struct fid *fhp;
-       struct mbuf *nam;
-       struct vnode **vpp;
-       int *exflagsp;
-       struct ucred **credanonp;
+hfs_fhtovp(struct mount *mp, int fhlen, unsigned char *fhp, struct vnode **vpp, __unused vfs_context_t context)
 {
        struct hfsfid *hfsfhp;
        struct vnode *nvp;
        int result;
-       struct netcred *np;
 
        *vpp = NULL;
        hfsfhp = (struct hfsfid *)fhp;
 
-       /*
-        * Get the export permission structure for this <mp, client> tuple.
-        */
-       np = vfs_export_lookup(mp, &VFSTOHFS(mp)->hfs_export, nam);
-       if (np == NULL) {
-               return EACCES;
-       };
+       if (fhlen < (int)sizeof(struct hfsfid))
+               return (EINVAL);
 
-       result = VFS_VGET(mp, &hfsfhp->hfsfid_cnid, &nvp);
-       if (result) return result;
-       if (nvp == NULL) return ESTALE;
+       result = hfs_vget(VFSTOHFS(mp), ntohl(hfsfhp->hfsfid_cnid), &nvp, 0);
+       if (result) {
+               if (result == ENOENT)
+                       result = ESTALE;
+               return result;
+       }
        
        /* The createtime can be changed by hfs_setattr or hfs_setattrlist.
         * For NFS, we are assuming that only if the createtime was moved
@@ -1750,15 +1901,14 @@ hfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
         * error prone. Future, would be change the "wrap bit" to a unique
         * wrap number and use that for generation number. For now do this.
         */  
-       if ((hfsfhp->hfsfid_gen < VTOC(nvp)->c_itime)) {
-               vput(nvp);
+       if (((time_t)(ntohl(hfsfhp->hfsfid_gen)) < VTOC(nvp)->c_itime)) {
+               hfs_unlock(VTOC(nvp));
+               vnode_put(nvp);
                return (ESTALE);
-       };
-       
+       }
        *vpp = nvp;
-       *exflagsp = np->netc_exflags;
-       *credanonp = &np->netc_anon;
-       
+
+       hfs_unlock(VTOC(nvp));
        return (0);
 }
 
@@ -1768,22 +1918,22 @@ hfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
  */
 /* ARGSUSED */
 static int
-hfs_vptofh(vp, fhp)
-       struct vnode *vp;
-       struct fid *fhp;
+hfs_vptofh(struct vnode *vp, int *fhlenp, unsigned char *fhp, __unused vfs_context_t context)
 {
        struct cnode *cp;
        struct hfsfid *hfsfhp;
 
        if (ISHFS(VTOVCB(vp)))
-               return (EOPNOTSUPP);    /* hfs standard is not exportable */
+               return (ENOTSUP);       /* hfs standard is not exportable */
+
+       if (*fhlenp < (int)sizeof(struct hfsfid))
+               return (EOVERFLOW);
 
        cp = VTOC(vp);
        hfsfhp = (struct hfsfid *)fhp;
-       hfsfhp->hfsfid_len = sizeof(struct hfsfid);
-       hfsfhp->hfsfid_pad = 0;
-       hfsfhp->hfsfid_cnid = cp->c_cnid;
-       hfsfhp->hfsfid_gen = cp->c_itime;
+       hfsfhp->hfsfid_cnid = htonl(cp->c_fileid);
+       hfsfhp->hfsfid_gen = htonl(cp->c_itime);
+       *fhlenp = sizeof(struct hfsfid);
        
        return (0);
 }
@@ -1793,8 +1943,7 @@ hfs_vptofh(vp, fhp)
  * Initial HFS filesystems, done only once.
  */
 static int
-hfs_init(vfsp)
-       struct vfsconf *vfsp;
+hfs_init(__unused struct vfsconf *vfsp)
 {
        static int done = 0;
 
@@ -1803,59 +1952,131 @@ hfs_init(vfsp)
        done = 1;
        hfs_chashinit();
        hfs_converterinit();
-#if QUOTA
-       dqinit();
-#endif /* QUOTA */
 
-       /*
-        * Allocate Catalog Iterator cache...
-        */
-       (void) InitCatalogCache();
+       BTReserveSetup();
+       
+       
+       hfs_lock_attr    = lck_attr_alloc_init();
+       hfs_group_attr   = lck_grp_attr_alloc_init();
+       hfs_mutex_group  = lck_grp_alloc_init("hfs-mutex", hfs_group_attr);
+       hfs_rwlock_group = lck_grp_alloc_init("hfs-rwlock", hfs_group_attr);
+       
 
        return (0);
 }
 
+static int
+hfs_getmountpoint(struct vnode *vp, struct hfsmount **hfsmpp)
+{
+       struct hfsmount * hfsmp;
+       char fstypename[MFSNAMELEN];
+
+       if (vp == NULL)
+               return (EINVAL);
+       
+       if (!vnode_isvroot(vp))
+               return (EINVAL);
+
+       vnode_vfsname(vp, fstypename);
+       if (strncmp(fstypename, "hfs", sizeof(fstypename)) != 0)
+               return (EINVAL);
+
+       hfsmp = VTOHFS(vp);
+
+       if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord)
+               return (EINVAL);
+
+       *hfsmpp = hfsmp;
+
+       return (0);
+}
 
 // XXXdbg
 #include <sys/filedesc.h>
 
-
 /*
  * HFS filesystem related variables.
  */
 static int
-hfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
-       int *name;
-       u_int namelen;
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       struct proc *p;
+hfs_sysctl(int *name, __unused u_int namelen, user_addr_t oldp, size_t *oldlenp, 
+                       user_addr_t newp, size_t newlen, vfs_context_t context)
 {
-       extern u_int32_t hfs_encodingbias;
+       struct proc *p = vfs_context_proc(context);
+       int error;
+       struct hfsmount *hfsmp;
 
        /* all sysctl names at this level are terminal */
 
-       if (name[0] == HFS_ENCODINGBIAS)
-               return (sysctl_int(oldp, oldlenp, newp, newlen,
-                               &hfs_encodingbias));
-       else if (name[0] == 0x082969) {
+       if (name[0] == HFS_ENCODINGBIAS) {
+               int bias;
+
+               bias = hfs_getencodingbias();
+               error = sysctl_int(oldp, oldlenp, newp, newlen, &bias);
+               if (error == 0 && newp)
+                       hfs_setencodingbias(bias);
+               return (error);
+
+       } else if (name[0] == HFS_EXTEND_FS) {
+        u_int64_t  newsize;
+               vnode_t vp = vfs_context_cwd(context);
+
+               if (newp == USER_ADDR_NULL || vp == NULLVP)
+                       return (EINVAL);
+               if ((error = hfs_getmountpoint(vp, &hfsmp)))
+                       return (error);
+               error = sysctl_quad(oldp, oldlenp, newp, newlen, (quad_t *)&newsize);
+               if (error)
+                       return (error);
+       
+               error = hfs_extendfs(hfsmp, newsize, context);          
+               return (error);
+
+       } else if (name[0] == HFS_ENCODINGHINT) {
+               size_t bufsize;
+               size_t bytes;
+               u_int32_t hint;
+               u_int16_t *unicode_name;
+               char *filename;
+
+               if ((newlen <= 0) || (newlen > MAXPATHLEN)) 
+                       return (EINVAL);
+
+               bufsize = MAX(newlen * 3, MAXPATHLEN);
+               MALLOC(filename, char *, newlen, M_TEMP, M_WAITOK);
+               MALLOC(unicode_name, u_int16_t *, bufsize, M_TEMP, M_WAITOK);
+
+               error = copyin(newp, (caddr_t)filename, newlen);
+               if (error == 0) {
+                       error = utf8_decodestr((u_int8_t *)filename, newlen - 1, unicode_name,
+                                              &bytes, bufsize, 0, UTF_DECOMPOSED);
+                       if (error == 0) {
+                               hint = hfs_pickencoding(unicode_name, bytes / 2);
+                               error = sysctl_int(oldp, oldlenp, USER_ADDR_NULL, 0, (int32_t *)&hint);
+                       }
+               }
+               FREE(unicode_name, M_TEMP);
+               FREE(filename, M_TEMP);
+               return (error);
+
+       } else if (name[0] == HFS_ENABLE_JOURNALING) {
                // make the file system journaled...
-               struct vnode *vp = p->p_fd->fd_cdir, *jvp;
-               struct hfsmount *hfsmp;
+               vnode_t vp = vfs_context_cwd(context);
+               vnode_t jvp;
                ExtendedVCB *vcb;
-               int retval;
                struct cat_attr jnl_attr, jinfo_attr;
                struct cat_fork jnl_fork, jinfo_fork;
                void *jnl = NULL;
+               int lockflags;
 
                /* Only root can enable journaling */
-        if (current_proc()->p_ucred->cr_uid != 0) {
+               if (!is_suser()) {
                        return (EPERM);
                }
+               if (vp == NULLVP)
+                       return EINVAL;
+
                hfsmp = VTOHFS(vp);
-               if (hfsmp->hfs_fs_ronly) {
+               if (hfsmp->hfs_flags & HFS_READ_ONLY) {
                        return EROFS;
                }
                if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord) {
@@ -1864,27 +2085,29 @@ hfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
                }
 
                if (hfsmp->jnl) {
-                   printf("hfs: volume @ mp 0x%x is already journaled!\n", vp->v_mount);
+                   printf("hfs: volume @ mp %p is already journaled!\n", vnode_mount(vp));
                    return EAGAIN;
                }
 
                vcb = HFSTOVCB(hfsmp);
+               lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG | SFL_EXTENTS, HFS_EXCLUSIVE_LOCK);
                if (BTHasContiguousNodes(VTOF(vcb->catalogRefNum)) == 0 ||
                        BTHasContiguousNodes(VTOF(vcb->extentsRefNum)) == 0) {
 
                        printf("hfs: volume has a btree w/non-contiguous nodes.  can not enable journaling.\n");
+                       hfs_systemfile_unlock(hfsmp, lockflags);
                        return EINVAL;
                }
+               hfs_systemfile_unlock(hfsmp, lockflags);
 
                // make sure these both exist!
-               if (   GetFileInfo(vcb, kRootDirID, ".journal_info_block", &jinfo_attr, &jinfo_fork) == 0
-                       || GetFileInfo(vcb, kRootDirID, ".journal", &jnl_attr, &jnl_fork) == 0) {
+               if (   GetFileInfo(vcb, kHFSRootFolderID, ".journal_info_block", &jinfo_attr, &jinfo_fork) == 0
+                       || GetFileInfo(vcb, kHFSRootFolderID, ".journal", &jnl_attr, &jnl_fork) == 0) {
 
                        return EINVAL;
                }
 
-               hfs_sync(hfsmp->hfs_mp, MNT_WAIT, FSCRED, p);
-               bflushq(BQ_META);
+               hfs_sync(hfsmp->hfs_mp, MNT_WAIT, context);
 
                printf("hfs: Initializing the journal (joffset 0x%llx sz 0x%llx)...\n",
                           (off_t)name[2], (off_t)name[3]);
@@ -1893,7 +2116,7 @@ hfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
                jnl = journal_create(jvp,
                                                         (off_t)name[2] * (off_t)HFSTOVCB(hfsmp)->blockSize
                                                         + HFSTOVCB(hfsmp)->hfsPlusIOPosOffset,
-                                                        (off_t)name[3],
+                                                        (off_t)((unsigned)name[3]),
                                                         hfsmp->hfs_devvp,
                                                         hfsmp->hfs_phys_block_size,
                                                         0,
@@ -1903,7 +2126,7 @@ hfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
                if (jnl == NULL) {
                        printf("hfs: FAILED to create the journal!\n");
                        if (jvp && jvp != hfsmp->hfs_devvp) {
-                               VOP_CLOSE(jvp, hfsmp->hfs_fs_ronly ? FREAD : FREAD|FWRITE, FSCRED, p);
+                               VNOP_CLOSE(jvp, hfsmp->hfs_flags & HFS_READ_ONLY ? FREAD : FREAD|FWRITE, context);
                        }
                        jvp = NULL;
 
@@ -1912,6 +2135,16 @@ hfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 
                hfs_global_exclusive_lock_acquire(hfsmp);
                
+               /*
+                * Flush all dirty metadata buffers.
+                */
+               buf_flushdirtyblks(hfsmp->hfs_devvp, MNT_WAIT, 0, "hfs_sysctl");
+               buf_flushdirtyblks(hfsmp->hfs_extents_vp, MNT_WAIT, 0, "hfs_sysctl");
+               buf_flushdirtyblks(hfsmp->hfs_catalog_vp, MNT_WAIT, 0, "hfs_sysctl");
+               buf_flushdirtyblks(hfsmp->hfs_allocation_vp, MNT_WAIT, 0, "hfs_sysctl");
+               if (hfsmp->hfs_attribute_vp)
+                       buf_flushdirtyblks(hfsmp->hfs_attribute_vp, MNT_WAIT, 0, "hfs_sysctl");
+
                HFSTOVCB(hfsmp)->vcbJinfoBlock = name[1];
                HFSTOVCB(hfsmp)->vcbAtrb |= kHFSVolumeJournaledMask;
                hfsmp->jvp = jvp;
@@ -1919,47 +2152,51 @@ hfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 
                // save this off for the hack-y check in hfs_remove()
                hfsmp->jnl_start        = (u_int32_t)name[2];
+               hfsmp->jnl_size         = (off_t)((unsigned)name[3]);
                hfsmp->hfs_jnlinfoblkid = jinfo_attr.ca_fileid;
                hfsmp->hfs_jnlfileid    = jnl_attr.ca_fileid;
 
-               hfsmp->hfs_mp->mnt_flag |= MNT_JOURNALED;
+               vfs_setflags(hfsmp->hfs_mp, (u_int64_t)((unsigned int)MNT_JOURNALED));
 
                hfs_global_exclusive_lock_release(hfsmp);
                hfs_flushvolumeheader(hfsmp, MNT_WAIT, 1);
 
                return 0;
-       } else if (name[0] == 0x031272) {
+       } else if (name[0] == HFS_DISABLE_JOURNALING) {
                // clear the journaling bit 
-               struct vnode *vp = p->p_fd->fd_cdir;
-               struct hfsmount *hfsmp;
-               void *jnl;
-               int retval;
+               vnode_t vp = vfs_context_cwd(context);
                
                /* Only root can disable journaling */
-        if (current_proc()->p_ucred->cr_uid != 0) {
+               if (!is_suser()) {
                        return (EPERM);
                }
+               if (vp == NULLVP)
+                       return EINVAL;
+
                hfsmp = VTOHFS(vp);
-               if (hfsmp->jnl == NULL) {
-                       return EINVAL;
+
+               /* 
+                * Disabling journaling is disallowed on volumes with directory hard links
+                * because we have not tested the relevant code path.
+                */  
+               if (hfsmp->hfs_private_attr[DIR_HARDLINKS].ca_entries != 0){
+                       printf("hfs: cannot disable journaling on volumes with directory hardlinks\n");
+                       return EPERM;
                }
 
-               printf("hfs: disabling journaling for mount @ 0x%x\n", vp->v_mount);
+               printf("hfs: disabling journaling for mount @ %p\n", vnode_mount(vp));
 
-               jnl = hfsmp->jnl;
-               
                hfs_global_exclusive_lock_acquire(hfsmp);
 
                // Lights out for you buddy!
+               journal_close(hfsmp->jnl);
                hfsmp->jnl = NULL;
-               journal_close(jnl);
 
                if (hfsmp->jvp && hfsmp->jvp != hfsmp->hfs_devvp) {
-                       VOP_CLOSE(hfsmp->jvp, hfsmp->hfs_fs_ronly ? FREAD : FREAD|FWRITE, FSCRED, p);
+                       VNOP_CLOSE(hfsmp->jvp, hfsmp->hfs_flags & HFS_READ_ONLY ? FREAD : FREAD|FWRITE, context);
                }
-               hfsmp->jnl = NULL;
                hfsmp->jvp = NULL;
-               hfsmp->hfs_mp->mnt_flag &= ~MNT_JOURNALED;
+               vfs_clearflags(hfsmp->hfs_mp, (u_int64_t)((unsigned int)MNT_JOURNALED));
                hfsmp->jnl_start        = 0;
                hfsmp->hfs_jnlinfoblkid = 0;
                hfsmp->hfs_jnlfileid    = 0;
@@ -1970,65 +2207,371 @@ hfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
                hfs_flushvolumeheader(hfsmp, MNT_WAIT, 1);
 
                return 0;
-       }
+       } else if (name[0] == HFS_GET_JOURNAL_INFO) {
+               vnode_t vp = vfs_context_cwd(context);
+               off_t jnl_start, jnl_size;
 
-       return (EOPNOTSUPP);
-}
+               if (vp == NULLVP)
+                       return EINVAL;
 
+               hfsmp = VTOHFS(vp);
+           if (hfsmp->jnl == NULL) {
+                       jnl_start = 0;
+                       jnl_size  = 0;
+           } else {
+                       jnl_start = (off_t)(hfsmp->jnl_start * HFSTOVCB(hfsmp)->blockSize) + (off_t)HFSTOVCB(hfsmp)->hfsPlusIOPosOffset;
+                       jnl_size  = (off_t)hfsmp->jnl_size;
+           }
 
-/*     This will return a vnode of either a directory or a data vnode based on an object id. If
- *  it is a file id, its data fork will be returned.
- */
-static int
-hfs_vget(mp, ino, vpp)
-       struct mount *mp;
-       void *ino;
-       struct vnode **vpp;
-{
-       cnid_t cnid = *(cnid_t *)ino;
+           if ((error = copyout((caddr_t)&jnl_start, CAST_USER_ADDR_T(name[1]), sizeof(off_t))) != 0) {
+                       return error;
+               }
+           if ((error = copyout((caddr_t)&jnl_size, CAST_USER_ADDR_T(name[2]), sizeof(off_t))) != 0) {
+                       return error;
+               }
+
+               return 0;
+       } else if (name[0] == HFS_SET_PKG_EXTENSIONS) {
+
+           return set_package_extensions_table((void *)name[1], name[2], name[3]);
+           
+       } else if (name[0] == VFS_CTL_QUERY) {
+       struct sysctl_req *req;
+       struct vfsidctl vc;
+           struct user_vfsidctl user_vc;
+       struct mount *mp;
+           struct vfsquery vq;
+           boolean_t is_64_bit;
        
-       /* Check for cnids that should't be exported. */
-       if ((cnid < kHFSFirstUserCatalogNodeID)
-       &&  (cnid != kHFSRootFolderID && cnid != kHFSRootParentID))
-               return (ENOENT);
-       /* Don't export HFS Private Data dir. */
-       if (cnid == VFSTOHFS(mp)->hfs_privdir_desc.cd_cnid)
-               return (ENOENT);
+       is_64_bit = proc_is64bit(p); 
+               req = CAST_DOWN(struct sysctl_req *, oldp);     /* we're new style vfs sysctl. */
+        
+        if (is_64_bit) {
+            error = SYSCTL_IN(req, &user_vc, sizeof(user_vc));
+            if (error) return (error);
+            
+            mp = vfs_getvfs(&user_vc.vc_fsid);
+        } 
+        else {
+            error = SYSCTL_IN(req, &vc, sizeof(vc));
+            if (error) return (error);
+            
+            mp = vfs_getvfs(&vc.vc_fsid);
+        }
+        if (mp == NULL) return (ENOENT);
+        
+               hfsmp = VFSTOHFS(mp);
+               bzero(&vq, sizeof(vq));
+               vq.vq_flags = hfsmp->hfs_notification_conditions;
+               return SYSCTL_OUT(req, &vq, sizeof(vq));;
+       } else if (name[0] == HFS_REPLAY_JOURNAL) {
+               char *devnode = NULL;
+               size_t devnode_len;
+
+               devnode_len = *oldlenp;
+               MALLOC(devnode, char *, devnode_len + 1, M_TEMP, M_WAITOK);
+               if (devnode == NULL) {
+                       return ENOMEM;
+               }
+
+               error = copyin(oldp, (caddr_t)devnode, devnode_len);
+               if (error) {
+                       FREE(devnode, M_TEMP);
+                       return error;
+               }
+               devnode[devnode_len] = 0;
+
+               error = hfs_journal_replay(devnode, context);
+               FREE(devnode, M_TEMP);
+               return error;
+       }
 
-       return (hfs_getcnode(VFSTOHFS(mp), cnid, NULL, 0, NULL, NULL, vpp));
+       return (ENOTSUP);
 }
 
-/*
- * Flush out all the files in a filesystem.
+/* hfs_vfs_vget is not static since it is used in hfs_readwrite.c to support the
+ * build_path ioctl.  We use it to leverage the code below that updates the origin
+ * cache if necessary.
  */
 int
-hfs_flushfiles(struct mount *mp, int flags, struct proc *p)
+hfs_vfs_vget(struct mount *mp, ino64_t ino, struct vnode **vpp, __unused vfs_context_t context)
 {
-       register struct hfsmount *hfsmp;
-       int i;
        int error;
+       int lockflags;
+       struct hfsmount *hfsmp;
+
+       hfsmp = VFSTOHFS(mp);
+
+       error = hfs_vget(hfsmp, (cnid_t)ino, vpp, 1);
+       if (error)
+               return (error);
+
+       /*
+        * ADLs may need to have their origin state updated
+        * since build_path needs a valid parent. The same is true
+        * for hardlinked files as well. There isn't a race window here in re-acquiring
+        * the cnode lock since we aren't pulling any data out of the cnode; instead, we're
+        * going back to the catalog.
+        */
+       if ((VTOC(*vpp)->c_flag & C_HARDLINK) &&
+           (hfs_lock(VTOC(*vpp), HFS_EXCLUSIVE_LOCK) == 0)) {
+               cnode_t *cp = VTOC(*vpp);
+               struct cat_desc cdesc;
+               
+               if (!hfs_haslinkorigin(cp)) {
+                       lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+                   error = cat_findname(hfsmp, (cnid_t)ino, &cdesc);
+                       hfs_systemfile_unlock(hfsmp, lockflags);
+                       if (error == 0) {
+                               if ((cdesc.cd_parentcnid !=
+                               hfsmp->hfs_private_desc[DIR_HARDLINKS].cd_cnid) && 
+                                       (cdesc.cd_parentcnid != 
+                                       hfsmp->hfs_private_desc[FILE_HARDLINKS].cd_cnid)) {
+                                       hfs_savelinkorigin(cp, cdesc.cd_parentcnid);
+                               }
+                               cat_releasedesc(&cdesc);
+                       }
+               }
+               hfs_unlock(cp);
+       }
+       return (0);
+}
+
+
+/*
+ * Look up an HFS object by ID.
+ *
+ * The object is returned with an iocount reference and the cnode locked.
+ *
+ * If the object is a file then it will represent the data fork.
+ */
+__private_extern__
+int
+hfs_vget(struct hfsmount *hfsmp, cnid_t cnid, struct vnode **vpp, int skiplock)
+{
+       struct vnode *vp = NULLVP;
+       struct cat_desc cndesc;
+       struct cat_attr cnattr;
+       struct cat_fork cnfork;
+       u_int32_t linkref = 0;
+       int error;
+       
+       /* Check for cnids that should't be exported. */
+       if ((cnid < kHFSFirstUserCatalogNodeID) &&
+           (cnid != kHFSRootFolderID && cnid != kHFSRootParentID)) {
+               return (ENOENT);
+       }
+       /* Don't export our private directories. */
+       if (cnid == hfsmp->hfs_private_desc[FILE_HARDLINKS].cd_cnid ||
+           cnid == hfsmp->hfs_private_desc[DIR_HARDLINKS].cd_cnid) {
+               return (ENOENT);
+       }
+       /*
+        * Check the hash first
+        */
+       vp = hfs_chash_getvnode(hfsmp->hfs_raw_dev, cnid, 0, skiplock);
+       if (vp) {
+               *vpp = vp;
+               return(0);
+       }
+
+       bzero(&cndesc, sizeof(cndesc));
+       bzero(&cnattr, sizeof(cnattr));
+       bzero(&cnfork, sizeof(cnfork));
+
+       /*
+        * Not in hash, lookup in catalog
+        */
+       if (cnid == kHFSRootParentID) {
+               static char hfs_rootname[] = "/";
+
+               cndesc.cd_nameptr = (const u_int8_t *)&hfs_rootname[0];
+               cndesc.cd_namelen = 1;
+               cndesc.cd_parentcnid = kHFSRootParentID;
+               cndesc.cd_cnid = kHFSRootFolderID;
+               cndesc.cd_flags = CD_ISDIR;
+
+               cnattr.ca_fileid = kHFSRootFolderID;
+               cnattr.ca_linkcount = 1;
+               cnattr.ca_entries = 1;
+               cnattr.ca_dircount = 1;
+               cnattr.ca_mode = (S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO);
+       } else {
+               int lockflags;
+               cnid_t pid;
+               const char *nameptr;
+
+               lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+               error = cat_idlookup(hfsmp, cnid, 0, &cndesc, &cnattr, &cnfork);
+               hfs_systemfile_unlock(hfsmp, lockflags);
+
+               if (error) {
+                       *vpp = NULL;
+                       return (error);
+               }
+
+               /*
+                * Check for a raw hardlink inode and save its linkref.
+                */
+               pid = cndesc.cd_parentcnid;
+               nameptr = (const char *)cndesc.cd_nameptr;
+
+               if ((pid == hfsmp->hfs_private_desc[FILE_HARDLINKS].cd_cnid) &&
+                   (bcmp(nameptr, HFS_INODE_PREFIX, HFS_INODE_PREFIX_LEN) == 0)) {
+                       linkref = strtoul(&nameptr[HFS_INODE_PREFIX_LEN], NULL, 10);
+
+               } else if ((pid == hfsmp->hfs_private_desc[DIR_HARDLINKS].cd_cnid) &&
+                          (bcmp(nameptr, HFS_DIRINODE_PREFIX, HFS_DIRINODE_PREFIX_LEN) == 0)) {
+                       linkref = strtoul(&nameptr[HFS_DIRINODE_PREFIX_LEN], NULL, 10);
+
+               } else if ((pid == hfsmp->hfs_private_desc[FILE_HARDLINKS].cd_cnid) &&
+                          (bcmp(nameptr, HFS_DELETE_PREFIX, HFS_DELETE_PREFIX_LEN) == 0)) {
+                       *vpp = NULL;
+                       cat_releasedesc(&cndesc);
+                       return (ENOENT);  /* open unlinked file */
+               }
+       }
+
+       /*
+        * Finish initializing cnode descriptor for hardlinks.
+        *
+        * We need a valid name and parent for reverse lookups.
+        */
+       if (linkref) {
+               cnid_t nextlinkid;
+               cnid_t prevlinkid;
+               struct cat_desc linkdesc;
+               int lockflags;
+
+               cnattr.ca_linkref = linkref;
+
+               /*
+                * Pick up the first link in the chain and get a descriptor for it.
+                * This allows blind volfs paths to work for hardlinks.
+                */
+               if ((hfs_lookuplink(hfsmp, linkref, &prevlinkid,  &nextlinkid) == 0) &&
+                   (nextlinkid != 0)) {
+                       lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+                       error = cat_findname(hfsmp, nextlinkid, &linkdesc);
+                       hfs_systemfile_unlock(hfsmp, lockflags);
+                       if (error == 0) {
+                               cat_releasedesc(&cndesc);
+                               bcopy(&linkdesc, &cndesc, sizeof(linkdesc));
+                       }
+               }       
+       }
+
+       if (linkref) {
+               error = hfs_getnewvnode(hfsmp, NULL, NULL, &cndesc, 0, &cnattr, &cnfork, &vp);
+               if (error == 0) {
+                       VTOC(vp)->c_flag |= C_HARDLINK;
+                       vnode_setmultipath(vp);
+               }
+       } else {
+               struct componentname cn;
+
+               /* Supply hfs_getnewvnode with a component name. */
+               MALLOC_ZONE(cn.cn_pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK);
+               cn.cn_nameiop = LOOKUP;
+               cn.cn_flags = ISLASTCN | HASBUF;
+               cn.cn_context = NULL;
+               cn.cn_pnlen = MAXPATHLEN;
+               cn.cn_nameptr = cn.cn_pnbuf;
+               cn.cn_namelen = cndesc.cd_namelen;
+               cn.cn_hash = 0;
+               cn.cn_consume = 0;
+               bcopy(cndesc.cd_nameptr, cn.cn_nameptr, cndesc.cd_namelen + 1);
+       
+               error = hfs_getnewvnode(hfsmp, NULLVP, &cn, &cndesc, 0, &cnattr, &cnfork, &vp);
+
+               if ((error == 0) && (VTOC(vp)->c_flag & C_HARDLINK)) {
+                       hfs_savelinkorigin(VTOC(vp), cndesc.cd_parentcnid);
+               }
+               FREE_ZONE(cn.cn_pnbuf, cn.cn_pnlen, M_NAMEI);
+       }
+       cat_releasedesc(&cndesc);
+
+       *vpp = vp;
+       if (vp && skiplock) {
+               hfs_unlock(VTOC(vp));
+       }
+       return (error);
+}
 
+
+/*
+ * Flush out all the files in a filesystem.
+ */
+static int
+#if QUOTA
+hfs_flushfiles(struct mount *mp, int flags, struct proc *p)
+#else
+hfs_flushfiles(struct mount *mp, int flags, __unused struct proc *p)
+#endif /* QUOTA */
+{
+       struct hfsmount *hfsmp;
+       struct vnode *skipvp = NULLVP;
+       int error;
 #if QUOTA
+       int quotafilecnt;
+       int i;
+#endif
+
        hfsmp = VFSTOHFS(mp);
 
-       if (mp->mnt_flag & MNT_QUOTA) {
-               if (error = vflush(mp, NULLVP, SKIPSYSTEM|flags))
+#if QUOTA
+       /*
+        * The open quota files have an indirect reference on
+        * the root directory vnode.  We must account for this
+        * extra reference when doing the intial vflush.
+        */
+       quotafilecnt = 0;
+       if (((unsigned int)vfs_flags(mp)) & MNT_QUOTA) {
+
+               /* Find out how many quota files we have open. */
+               for (i = 0; i < MAXQUOTAS; i++) {
+                       if (hfsmp->hfs_qfiles[i].qf_vp != NULLVP)
+                               ++quotafilecnt;
+               }
+
+               /* Obtain the root vnode so we can skip over it. */
+               skipvp = hfs_chash_getvnode(hfsmp->hfs_raw_dev, kHFSRootFolderID, 0, 0);
+       }
+#endif /* QUOTA */
+
+       error = vflush(mp, skipvp, SKIPSYSTEM | SKIPSWAP | flags);
+       if (error != 0)
+               return(error);
+
+       error = vflush(mp, skipvp, SKIPSYSTEM | flags);
+
+#if QUOTA
+       if (((unsigned int)vfs_flags(mp)) & MNT_QUOTA) {
+               if (skipvp) {
+                       /*
+                        * See if there are additional references on the
+                        * root vp besides the ones obtained from the open
+                        * quota files and the hfs_chash_getvnode call above.
+                        */
+                       if ((error == 0) &&
+                           (vnode_isinuse(skipvp,  quotafilecnt))) {
+                               error = EBUSY;  /* root directory is still open */
+                       }
+                       hfs_unlock(VTOC(skipvp));
+                       vnode_put(skipvp);
+               }
+               if (error && (flags & FORCECLOSE) == 0)
                        return (error);
+
                for (i = 0; i < MAXQUOTAS; i++) {
                        if (hfsmp->hfs_qfiles[i].qf_vp == NULLVP)
                                continue;
                        hfs_quotaoff(p, mp, i);
                }
-               /*
-                * Here we fall through to vflush again to ensure
-                * that we have gotten rid of all the system vnodes.
-                */
+               error = vflush(mp, NULLVP, SKIPSYSTEM | flags);
        }
 #endif /* QUOTA */
 
-       error = vflush(mp, NULLVP, (SKIPSYSTEM | SKIPSWAP | flags));
-       error = vflush(mp, NULLVP, (SKIPSYSTEM | flags));
-
        return (error);
 }
 
@@ -2042,7 +2585,7 @@ hfs_setencodingbits(struct hfsmount *hfsmp, u_int32_t encoding)
 #define  kIndexMacUkrainian    48  /* MacUkrainian encoding is 152 */
 #define  kIndexMacFarsi                49  /* MacFarsi encoding is 140 */
 
-       UInt32  index;
+       u_int32_t       index;
 
        switch (encoding) {
        case kTextEncodingMacUkrainian:
@@ -2056,54 +2599,63 @@ hfs_setencodingbits(struct hfsmount *hfsmp, u_int32_t encoding)
                break;
        }
 
-       if (index < 128) {
-               HFSTOVCB(hfsmp)->encodingsBitmap |= (1 << index);
-               HFSTOVCB(hfsmp)->vcbFlags |= 0xFF00;
+       if (index < 64 && (hfsmp->encodingsBitmap & (u_int64_t)(1ULL << index)) == 0) {
+               HFS_MOUNT_LOCK(hfsmp, TRUE)
+               hfsmp->encodingsBitmap |= (u_int64_t)(1ULL << index);
+               MarkVCBDirty(hfsmp);
+               HFS_MOUNT_UNLOCK(hfsmp, TRUE);
        }
 }
 
 /*
  * Update volume stats
+ *
+ * On journal volumes this will cause a volume header flush
  */
 __private_extern__
 int
 hfs_volupdate(struct hfsmount *hfsmp, enum volop op, int inroot)
 {
-       ExtendedVCB *vcb;
+       struct timeval tv;
 
-       vcb = HFSTOVCB(hfsmp);
-       vcb->vcbFlags |= 0xFF00;
-       vcb->vcbLsMod = time.tv_sec;
+       microtime(&tv);
+
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+
+       MarkVCBDirty(hfsmp);
+       hfsmp->hfs_mtime = tv.tv_sec;
 
        switch (op) {
        case VOL_UPDATE:
                break;
        case VOL_MKDIR:
-               if (vcb->vcbDirCnt != 0xFFFFFFFF)
-                       ++vcb->vcbDirCnt;
-               if (inroot && vcb->vcbNmRtDirs != 0xFFFF)
-                       ++vcb->vcbNmRtDirs;
+               if (hfsmp->hfs_dircount != 0xFFFFFFFF)
+                       ++hfsmp->hfs_dircount;
+               if (inroot && hfsmp->vcbNmRtDirs != 0xFFFF)
+                       ++hfsmp->vcbNmRtDirs;
                break;
        case VOL_RMDIR:
-               if (vcb->vcbDirCnt != 0)
-                       --vcb->vcbDirCnt;
-               if (inroot && vcb->vcbNmRtDirs != 0xFFFF)
-                       --vcb->vcbNmRtDirs;
+               if (hfsmp->hfs_dircount != 0)
+                       --hfsmp->hfs_dircount;
+               if (inroot && hfsmp->vcbNmRtDirs != 0xFFFF)
+                       --hfsmp->vcbNmRtDirs;
                break;
        case VOL_MKFILE:
-               if (vcb->vcbFilCnt != 0xFFFFFFFF)
-                       ++vcb->vcbFilCnt;
-               if (inroot && vcb->vcbNmFls != 0xFFFF)
-                       ++vcb->vcbNmFls;
+               if (hfsmp->hfs_filecount != 0xFFFFFFFF)
+                       ++hfsmp->hfs_filecount;
+               if (inroot && hfsmp->vcbNmFls != 0xFFFF)
+                       ++hfsmp->vcbNmFls;
                break;
        case VOL_RMFILE:
-               if (vcb->vcbFilCnt != 0)
-                       --vcb->vcbFilCnt;
-               if (inroot && vcb->vcbNmFls != 0xFFFF)
-                       --vcb->vcbNmFls;
+               if (hfsmp->hfs_filecount != 0)
+                       --hfsmp->hfs_filecount;
+               if (inroot && hfsmp->vcbNmFls != 0xFFFF)
+                       --hfsmp->vcbNmFls;
                break;
        }
 
+       lck_mtx_unlock(&hfsmp->hfs_mutex);
+
        if (hfsmp->jnl) {
                hfs_flushvolumeheader(hfsmp, 0, 0);
        }
@@ -2124,22 +2676,16 @@ hfs_flushMDB(struct hfsmount *hfsmp, int waitfor, int altflush)
        ByteCount namelen;
 
        sectorsize = hfsmp->hfs_phys_block_size;
-       retval = bread(hfsmp->hfs_devvp, HFS_PRI_SECTOR(sectorsize), sectorsize, NOCRED, &bp);
+       retval = (int)buf_bread(hfsmp->hfs_devvp, (daddr64_t)HFS_PRI_SECTOR(sectorsize), sectorsize, NOCRED, &bp);
        if (retval) {
                if (bp)
-                       brelse(bp);
+                       buf_brelse(bp);
                return retval;
        }
 
-       DBG_ASSERT(bp != NULL);
-       DBG_ASSERT(bp->b_data != NULL);
-       DBG_ASSERT(bp->b_bcount == size);
-
-       if (hfsmp->jnl) {
-               panic("hfs: standard hfs volumes should not be journaled!\n");
-       }
+       lck_mtx_lock(&hfsmp->hfs_mutex);
 
-       mdb = (HFSMasterDirectoryBlock *)(bp->b_data + HFS_PRI_OFFSET(sectorsize));
+       mdb = (HFSMasterDirectoryBlock *)(buf_dataptr(bp) + HFS_PRI_OFFSET(sectorsize));
     
        mdb->drCrDate   = SWAP_BE32 (UTCToLocal(to_hfs_time(vcb->vcbCrDate)));
        mdb->drLsMod    = SWAP_BE32 (UTCToLocal(to_hfs_time(vcb->vcbLsMod)));
@@ -2150,7 +2696,7 @@ hfs_flushMDB(struct hfsmount *hfsmp, int waitfor, int altflush)
        mdb->drNxtCNID  = SWAP_BE32 (vcb->vcbNxtCNID);
        mdb->drFreeBks  = SWAP_BE16 (vcb->freeBlocks);
 
-       namelen = strlen(vcb->vcbVN);
+       namelen = strlen((char *)vcb->vcbVN);
        retval = utf8_to_hfs(vcb, namelen, vcb->vcbVN, mdb->drVN);
        /* Retry with MacRoman in case that's how it was exported. */
        if (retval)
@@ -2173,6 +2719,7 @@ hfs_flushMDB(struct hfsmount *hfsmp, int waitfor, int altflush)
        mdb->drXTExtRec[2].blockCount = SWAP_BE16 (fp->ff_extents[2].blockCount);
        mdb->drXTFlSize = SWAP_BE32 (fp->ff_blocks * vcb->blockSize);
        mdb->drXTClpSiz = SWAP_BE32 (fp->ff_clumpsize);
+       FTOC(fp)->c_flag &= ~C_MODIFIED;
        
        fp = VTOF(vcb->catalogRefNum);
        mdb->drCTExtRec[0].startBlock = SWAP_BE16 (fp->ff_extents[0].startBlock);
@@ -2183,33 +2730,40 @@ hfs_flushMDB(struct hfsmount *hfsmp, int waitfor, int altflush)
        mdb->drCTExtRec[2].blockCount = SWAP_BE16 (fp->ff_extents[2].blockCount);
        mdb->drCTFlSize = SWAP_BE32 (fp->ff_blocks * vcb->blockSize);
        mdb->drCTClpSiz = SWAP_BE32 (fp->ff_clumpsize);
+       FTOC(fp)->c_flag &= ~C_MODIFIED;
+
+       MarkVCBClean( vcb );
+
+       lck_mtx_unlock(&hfsmp->hfs_mutex);
 
        /* If requested, flush out the alternate MDB */
        if (altflush) {
                struct buf *alt_bp = NULL;
-               u_long altIDSector;
 
-               altIDSector = HFS_ALT_SECTOR(sectorsize, hfsmp->hfs_phys_block_count);
+               if (buf_meta_bread(hfsmp->hfs_devvp, hfsmp->hfs_alt_id_sector, sectorsize, NOCRED, &alt_bp) == 0) {
+                       bcopy(mdb, (char *)buf_dataptr(alt_bp) + HFS_ALT_OFFSET(sectorsize), kMDBSize);
 
-               if (meta_bread(hfsmp->hfs_devvp, altIDSector, sectorsize, NOCRED, &alt_bp) == 0) {
-                       bcopy(mdb, alt_bp->b_data + HFS_ALT_OFFSET(sectorsize), kMDBSize);
-
-                       (void) VOP_BWRITE(alt_bp);
+                       (void) VNOP_BWRITE(alt_bp);
                } else if (alt_bp)
-                       brelse(alt_bp);
+                       buf_brelse(alt_bp);
        }
 
        if (waitfor != MNT_WAIT)
-               bawrite(bp);
+               buf_bawrite(bp);
        else 
-               retval = VOP_BWRITE(bp);
-       MarkVCBClean( vcb );
+               retval = VNOP_BWRITE(bp);
 
        return (retval);
 }
 
-
+/*
+ *  Flush any dirty in-memory mount data to the on-disk
+ *  volume header.
+ *
+ *  Note: the on-disk volume signature is intentionally
+ *  not flushed since the on-disk "H+" and "HX" signatures
+ *  are always stored in-memory as "H+".
+ */
 __private_extern__
 int
 hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush)
@@ -2221,37 +2775,34 @@ hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush)
        struct buf *bp;
        int i;
        int sectorsize;
-       int priIDSector;
-       int critical = 0;
+       daddr64_t priIDSector;
+       int critical;
+       u_int16_t  signature;
+       u_int16_t  hfsversion;
 
-       if (vcb->vcbSigWord == kHFSSigWord)
+       if (hfsmp->hfs_flags & HFS_READ_ONLY) {
+               return(0);
+       }
+       if (hfsmp->hfs_flags & HFS_STANDARD) {
                return hfs_flushMDB(hfsmp, waitfor, altflush);
-
-       if (altflush)
-               critical = 1;
+       }
+       critical = altflush;
        sectorsize = hfsmp->hfs_phys_block_size;
-       priIDSector = (vcb->hfsPlusIOPosOffset / sectorsize) +
-                       HFS_PRI_SECTOR(sectorsize);
+       priIDSector = (daddr64_t)((vcb->hfsPlusIOPosOffset / sectorsize) +
+                                 HFS_PRI_SECTOR(sectorsize));
 
-       // XXXdbg
-       hfs_global_shared_lock_acquire(hfsmp);
-       if (hfsmp->jnl) {
-               if (journal_start_transaction(hfsmp->jnl) != 0) {
-                       hfs_global_shared_lock_release(hfsmp);
-                   return EINVAL;
-           }
+       if (hfs_start_transaction(hfsmp) != 0) {
+           return EINVAL;
        }
 
-       retval = meta_bread(hfsmp->hfs_devvp, priIDSector, sectorsize, NOCRED, &bp);
+       retval = (int)buf_meta_bread(hfsmp->hfs_devvp, priIDSector, sectorsize, NOCRED, &bp);
        if (retval) {
                if (bp)
-                       brelse(bp);
+                       buf_brelse(bp);
 
-               if (hfsmp->jnl) {
-                       journal_end_transaction(hfsmp->jnl);
-               }
-               hfs_global_shared_lock_release(hfsmp);
+               hfs_end_transaction(hfsmp);
 
+               printf("HFS: err %d reading VH blk (%s)\n", retval, vcb->vcbVN);
                return (retval);
        }
 
@@ -2259,7 +2810,25 @@ hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush)
                journal_modify_block_start(hfsmp->jnl, bp);
        }
 
-       volumeHeader = (HFSPlusVolumeHeader *)((char *)bp->b_data + HFS_PRI_OFFSET(sectorsize));
+       volumeHeader = (HFSPlusVolumeHeader *)((char *)buf_dataptr(bp) + HFS_PRI_OFFSET(sectorsize));
+
+       /*
+        * Sanity check what we just read.
+        */
+       signature = SWAP_BE16 (volumeHeader->signature);
+       hfsversion   = SWAP_BE16 (volumeHeader->version);
+       if ((signature != kHFSPlusSigWord && signature != kHFSXSigWord) ||
+           (hfsversion < kHFSPlusVersion) || (hfsversion > 100) ||
+           (SWAP_BE32 (volumeHeader->blockSize) != vcb->blockSize)) {
+#if 1
+               panic("HFS: corrupt VH on %s, sig 0x%04x, ver %d, blksize %d",
+                     vcb->vcbVN, signature, hfsversion,
+                     SWAP_BE32 (volumeHeader->blockSize));
+#endif
+               printf("HFS: corrupt VH blk (%s)\n", vcb->vcbVN);
+               buf_brelse(bp);
+               return (EIO);
+       }
 
        /*
         * For embedded HFS+ volumes, update create date if it changed
@@ -2270,64 +2839,42 @@ hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush)
                struct buf *bp2;
                HFSMasterDirectoryBlock *mdb;
 
-               retval = meta_bread(hfsmp->hfs_devvp, HFS_PRI_SECTOR(sectorsize),
+               retval = (int)buf_meta_bread(hfsmp->hfs_devvp, (daddr64_t)HFS_PRI_SECTOR(sectorsize),
                                sectorsize, NOCRED, &bp2);
                if (retval) {
                        if (bp2)
-                               brelse(bp2);
+                               buf_brelse(bp2);
                        retval = 0;
                } else {
-                       mdb = (HFSMasterDirectoryBlock *)(bp2->b_data +
+                       mdb = (HFSMasterDirectoryBlock *)(buf_dataptr(bp2) +
                                HFS_PRI_OFFSET(sectorsize));
 
                        if ( SWAP_BE32 (mdb->drCrDate) != vcb->localCreateDate )
                          {
-                               // XXXdbg
                                if (hfsmp->jnl) {
                                    journal_modify_block_start(hfsmp->jnl, bp2);
                                }
 
                                mdb->drCrDate = SWAP_BE32 (vcb->localCreateDate);       /* pick up the new create date */
 
-                               // XXXdbg
                                if (hfsmp->jnl) {
-                                       journal_modify_block_end(hfsmp->jnl, bp2);
+                                       journal_modify_block_end(hfsmp->jnl, bp2, NULL, NULL);
                                } else {
-                                       (void) VOP_BWRITE(bp2);         /* write out the changes */
+                                       (void) VNOP_BWRITE(bp2);                /* write out the changes */
                                }
                          }
                        else
                          {
-                               brelse(bp2);                                            /* just release it */
+                               buf_brelse(bp2);                                                /* just release it */
                          }
                  }     
        }
 
-// XXXdbg - only monkey around with the volume signature on non-root volumes
-//
-#if 0
-       if (hfsmp->jnl &&
-               hfsmp->hfs_fs_ronly == 0 &&
-               (HFSTOVFS(hfsmp)->mnt_flag & MNT_ROOTFS) == 0) {
-               
-               int old_sig = volumeHeader->signature;
-
-               if (vcb->vcbAtrb & kHFSVolumeUnmountedMask) {
-                       volumeHeader->signature = kHFSPlusSigWord;
-               } else {
-                       volumeHeader->signature = kHFSJSigWord;
-               }
-
-               if (old_sig != volumeHeader->signature) {
-                       altflush = 1;
-               }
-       }
-#endif
-// XXXdbg
+       lck_mtx_lock(&hfsmp->hfs_mutex);
 
        /* Note: only update the lower 16 bits worth of attributes */
-       volumeHeader->attributes        = SWAP_BE32 ((SWAP_BE32 (volumeHeader->attributes) & 0xFFFF0000) + (UInt16) vcb->vcbAtrb);
-       volumeHeader->journalInfoBlock = SWAP_BE32(vcb->vcbJinfoBlock);
+       volumeHeader->attributes       = SWAP_BE32 (vcb->vcbAtrb);
+       volumeHeader->journalInfoBlock = SWAP_BE32 (vcb->vcbJinfoBlock);
        if (hfsmp->jnl) {
                volumeHeader->lastMountedVersion = SWAP_BE32 (kHFSJMountVersion);
        } else {
@@ -2338,6 +2885,7 @@ hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush)
        volumeHeader->backupDate        = SWAP_BE32 (to_hfs_time(vcb->vcbVolBkUp));
        volumeHeader->fileCount         = SWAP_BE32 (vcb->vcbFilCnt);
        volumeHeader->folderCount       = SWAP_BE32 (vcb->vcbDirCnt);
+       volumeHeader->totalBlocks       = SWAP_BE32 (vcb->totalBlocks);
        volumeHeader->freeBlocks        = SWAP_BE32 (vcb->freeBlocks);
        volumeHeader->nextAllocation    = SWAP_BE32 (vcb->nextAllocation);
        volumeHeader->rsrcClumpSize     = SWAP_BE32 (vcb->vcbClpSiz);
@@ -2346,96 +2894,2054 @@ hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush)
        volumeHeader->writeCount        = SWAP_BE32 (vcb->vcbWrCnt);
        volumeHeader->encodingsBitmap   = SWAP_BE64 (vcb->encodingsBitmap);
 
-       if (bcmp(vcb->vcbFndrInfo, volumeHeader->finderInfo, sizeof(volumeHeader->finderInfo)) != 0)
+       if (bcmp(vcb->vcbFndrInfo, volumeHeader->finderInfo, sizeof(volumeHeader->finderInfo)) != 0) {
+               bcopy(vcb->vcbFndrInfo, volumeHeader->finderInfo, sizeof(volumeHeader->finderInfo));
                critical = 1;
-       bcopy(vcb->vcbFndrInfo, volumeHeader->finderInfo, sizeof(volumeHeader->finderInfo));
+       }
+
+       /*
+        * System files are only dirty when altflush is set.
+        */
+       if (altflush == 0) {
+               goto done;
+       }
 
        /* Sync Extents over-flow file meta data */
        fp = VTOF(vcb->extentsRefNum);
-       for (i = 0; i < kHFSPlusExtentDensity; i++) {
-               volumeHeader->extentsFile.extents[i].startBlock =
-                       SWAP_BE32 (fp->ff_extents[i].startBlock);
-               volumeHeader->extentsFile.extents[i].blockCount =
-                       SWAP_BE32 (fp->ff_extents[i].blockCount);
+       if (FTOC(fp)->c_flag & C_MODIFIED) {
+               for (i = 0; i < kHFSPlusExtentDensity; i++) {
+                       volumeHeader->extentsFile.extents[i].startBlock =
+                               SWAP_BE32 (fp->ff_extents[i].startBlock);
+                       volumeHeader->extentsFile.extents[i].blockCount =
+                               SWAP_BE32 (fp->ff_extents[i].blockCount);
+               }
+               volumeHeader->extentsFile.logicalSize = SWAP_BE64 (fp->ff_size);
+               volumeHeader->extentsFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
+               volumeHeader->extentsFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
+               FTOC(fp)->c_flag &= ~C_MODIFIED;
        }
-       FTOC(fp)->c_flag &= ~C_MODIFIED;
-       volumeHeader->extentsFile.logicalSize = SWAP_BE64 (fp->ff_size);
-       volumeHeader->extentsFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
-       volumeHeader->extentsFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
 
        /* Sync Catalog file meta data */
        fp = VTOF(vcb->catalogRefNum);
-       for (i = 0; i < kHFSPlusExtentDensity; i++) {
-               volumeHeader->catalogFile.extents[i].startBlock =
-                       SWAP_BE32 (fp->ff_extents[i].startBlock);
-               volumeHeader->catalogFile.extents[i].blockCount =
-                       SWAP_BE32 (fp->ff_extents[i].blockCount);
+       if (FTOC(fp)->c_flag & C_MODIFIED) {
+               for (i = 0; i < kHFSPlusExtentDensity; i++) {
+                       volumeHeader->catalogFile.extents[i].startBlock =
+                               SWAP_BE32 (fp->ff_extents[i].startBlock);
+                       volumeHeader->catalogFile.extents[i].blockCount =
+                               SWAP_BE32 (fp->ff_extents[i].blockCount);
+               }
+               volumeHeader->catalogFile.logicalSize = SWAP_BE64 (fp->ff_size);
+               volumeHeader->catalogFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
+               volumeHeader->catalogFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
+               FTOC(fp)->c_flag &= ~C_MODIFIED;
        }
-       FTOC(fp)->c_flag &= ~C_MODIFIED;
-       volumeHeader->catalogFile.logicalSize = SWAP_BE64 (fp->ff_size);
-       volumeHeader->catalogFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
-       volumeHeader->catalogFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
 
        /* Sync Allocation file meta data */
        fp = VTOF(vcb->allocationsRefNum);
-       for (i = 0; i < kHFSPlusExtentDensity; i++) {
-               volumeHeader->allocationFile.extents[i].startBlock =
-                       SWAP_BE32 (fp->ff_extents[i].startBlock);
-               volumeHeader->allocationFile.extents[i].blockCount =
-                       SWAP_BE32 (fp->ff_extents[i].blockCount);
+       if (FTOC(fp)->c_flag & C_MODIFIED) {
+               for (i = 0; i < kHFSPlusExtentDensity; i++) {
+                       volumeHeader->allocationFile.extents[i].startBlock =
+                               SWAP_BE32 (fp->ff_extents[i].startBlock);
+                       volumeHeader->allocationFile.extents[i].blockCount =
+                               SWAP_BE32 (fp->ff_extents[i].blockCount);
+               }
+               volumeHeader->allocationFile.logicalSize = SWAP_BE64 (fp->ff_size);
+               volumeHeader->allocationFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
+               volumeHeader->allocationFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
+               FTOC(fp)->c_flag &= ~C_MODIFIED;
+       }
+
+       /* Sync Attribute file meta data */
+       if (hfsmp->hfs_attribute_vp) {
+               fp = VTOF(hfsmp->hfs_attribute_vp);
+               for (i = 0; i < kHFSPlusExtentDensity; i++) {
+                       volumeHeader->attributesFile.extents[i].startBlock =
+                               SWAP_BE32 (fp->ff_extents[i].startBlock);
+                       volumeHeader->attributesFile.extents[i].blockCount =
+                               SWAP_BE32 (fp->ff_extents[i].blockCount);
+               }
+               FTOC(fp)->c_flag &= ~C_MODIFIED;
+               volumeHeader->attributesFile.logicalSize = SWAP_BE64 (fp->ff_size);
+               volumeHeader->attributesFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
+               volumeHeader->attributesFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
+       }
+
+       /* Sync Startup file meta data */
+       if (hfsmp->hfs_startup_vp) {
+               fp = VTOF(hfsmp->hfs_startup_vp);
+               if (FTOC(fp)->c_flag & C_MODIFIED) {
+                       for (i = 0; i < kHFSPlusExtentDensity; i++) {
+                               volumeHeader->startupFile.extents[i].startBlock =
+                                       SWAP_BE32 (fp->ff_extents[i].startBlock);
+                               volumeHeader->startupFile.extents[i].blockCount =
+                                       SWAP_BE32 (fp->ff_extents[i].blockCount);
+                       }
+                       volumeHeader->startupFile.logicalSize = SWAP_BE64 (fp->ff_size);
+                       volumeHeader->startupFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
+                       volumeHeader->startupFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
+                       FTOC(fp)->c_flag &= ~C_MODIFIED;
+               }
        }
-       FTOC(fp)->c_flag &= ~C_MODIFIED;
-       volumeHeader->allocationFile.logicalSize = SWAP_BE64 (fp->ff_size);
-       volumeHeader->allocationFile.totalBlocks = SWAP_BE32 (fp->ff_blocks);
-       volumeHeader->allocationFile.clumpSize   = SWAP_BE32 (fp->ff_clumpsize);
+
+done:
+       MarkVCBClean(hfsmp);
+       lck_mtx_unlock(&hfsmp->hfs_mutex);
 
        /* If requested, flush out the alternate volume header */
-       if (altflush) {
+       if (altflush && hfsmp->hfs_alt_id_sector) {
                struct buf *alt_bp = NULL;
-               u_long altIDSector;
 
-               altIDSector = (vcb->hfsPlusIOPosOffset / sectorsize) +
-                       HFS_ALT_SECTOR(sectorsize, hfsmp->hfs_phys_block_count);
-
-               if (meta_bread(hfsmp->hfs_devvp, altIDSector, sectorsize, NOCRED, &alt_bp) == 0) {
+               if (buf_meta_bread(hfsmp->hfs_devvp, hfsmp->hfs_alt_id_sector, sectorsize, NOCRED, &alt_bp) == 0) {
                        if (hfsmp->jnl) {
                                journal_modify_block_start(hfsmp->jnl, alt_bp);
                        }
 
-                       bcopy(volumeHeader, alt_bp->b_data + HFS_ALT_OFFSET(sectorsize), kMDBSize);
+                       bcopy(volumeHeader, (char *)buf_dataptr(alt_bp) + HFS_ALT_OFFSET(sectorsize), kMDBSize);
 
                        if (hfsmp->jnl) {
-                               journal_modify_block_end(hfsmp->jnl, alt_bp);
+                               journal_modify_block_end(hfsmp->jnl, alt_bp, NULL, NULL);
                        } else {
-                               (void) VOP_BWRITE(alt_bp);
+                               (void) VNOP_BWRITE(alt_bp);
                        }
                } else if (alt_bp)
-                       brelse(alt_bp);
+                       buf_brelse(alt_bp);
        }
 
-       // XXXdbg
        if (hfsmp->jnl) {
-               journal_modify_block_end(hfsmp->jnl, bp);
-               journal_end_transaction(hfsmp->jnl);
+               journal_modify_block_end(hfsmp->jnl, bp, NULL, NULL);
        } else {
                if (waitfor != MNT_WAIT)
-                       bawrite(bp);
+                       buf_bawrite(bp);
                else {
-                   retval = VOP_BWRITE(bp);
+                   retval = VNOP_BWRITE(bp);
                    /* When critical data changes, flush the device cache */
                    if (critical && (retval == 0)) {
-                       (void) VOP_IOCTL(hfsmp->hfs_devvp, DKIOCSYNCHRONIZECACHE,
-                                        NULL, FWRITE, NOCRED, current_proc());
+                       (void) VNOP_IOCTL(hfsmp->hfs_devvp, DKIOCSYNCHRONIZECACHE,
+                                        NULL, FWRITE, NULL);
                    }
                }
        }
-       hfs_global_shared_lock_release(hfsmp);
+       hfs_end_transaction(hfsmp);
  
-       vcb->vcbFlags &= 0x00FF;
        return (retval);
 }
 
 
+/*
+ * Extend a file system.
+ */
+__private_extern__
+int
+hfs_extendfs(struct hfsmount *hfsmp, u_int64_t newsize, vfs_context_t context)
+{
+       struct proc *p = vfs_context_proc(context);
+       kauth_cred_t cred = vfs_context_ucred(context);
+       struct  vnode *vp;
+       struct  vnode *devvp;
+       struct  buf *bp;
+       struct  filefork *fp = NULL;
+       ExtendedVCB  *vcb;
+       struct  cat_fork forkdata;
+       u_int64_t  oldsize;
+       u_int64_t  newblkcnt;
+       u_int64_t  prev_phys_block_count;
+       u_int32_t  addblks;
+       u_int64_t  sectorcnt;
+       u_int32_t  sectorsize;
+       daddr64_t  prev_alt_sector;
+       daddr_t    bitmapblks;
+       int  lockflags;
+       int  error;
+       int64_t oldBitmapSize;
+       Boolean  usedExtendFileC = false;
+       
+       devvp = hfsmp->hfs_devvp;
+       vcb = HFSTOVCB(hfsmp);
+
+       /*
+        * - HFS Plus file systems only. 
+        * - Journaling must be enabled.
+        * - No embedded volumes.
+        */
+       if ((vcb->vcbSigWord == kHFSSigWord) ||
+            (hfsmp->jnl == NULL) ||
+            (vcb->hfsPlusIOPosOffset != 0)) {
+               return (EPERM);
+       }
+       /*
+        * If extending file system by non-root, then verify
+        * ownership and check permissions.
+        */
+       if (suser(cred, NULL)) {
+               error = hfs_vget(hfsmp, kHFSRootFolderID, &vp, 0);
+
+               if (error)
+                       return (error);
+               error = hfs_owner_rights(hfsmp, VTOC(vp)->c_uid, cred, p, 0);
+               if (error == 0) {
+                       error = hfs_write_access(vp, cred, p, false);
+               }
+               hfs_unlock(VTOC(vp));
+               vnode_put(vp);
+               if (error)
+                       return (error);
+
+               error = vnode_authorize(devvp, NULL, KAUTH_VNODE_READ_DATA | KAUTH_VNODE_WRITE_DATA, context);
+               if (error)
+                       return (error);
+       }
+       if (VNOP_IOCTL(devvp, DKIOCGETBLOCKSIZE, (caddr_t)&sectorsize, 0, context)) {
+               return (ENXIO);
+       }
+       if (sectorsize != hfsmp->hfs_phys_block_size) {
+               return (ENXIO);
+       }
+       if (VNOP_IOCTL(devvp, DKIOCGETBLOCKCOUNT, (caddr_t)&sectorcnt, 0, context)) {
+               return (ENXIO);
+       }
+       if ((sectorsize * sectorcnt) < newsize) {
+               printf("hfs_extendfs: not enough space on device\n");
+               return (ENOSPC);
+       }
+       oldsize = (u_int64_t)hfsmp->totalBlocks * (u_int64_t)hfsmp->blockSize;
+
+       /*
+        * Validate new size.
+        */
+       if ((newsize <= oldsize) || (newsize % sectorsize)) {
+               printf("hfs_extendfs: invalid size\n");
+               return (EINVAL);
+       }
+       newblkcnt = newsize / vcb->blockSize;
+       if (newblkcnt > (u_int64_t)0xFFFFFFFF)
+               return (EOVERFLOW);
+
+       addblks = newblkcnt - vcb->totalBlocks;
+
+       printf("hfs_extendfs: growing %s by %d blocks\n", vcb->vcbVN, addblks);
+       /*
+        * Enclose changes inside a transaction.
+        */
+       if (hfs_start_transaction(hfsmp) != 0) {
+               return (EINVAL);
+       }
+
+       /*
+        * Note: we take the attributes lock in case we have an attribute data vnode
+        * which needs to change size.
+        */
+       lockflags = hfs_systemfile_lock(hfsmp, SFL_ATTRIBUTE | SFL_EXTENTS | SFL_BITMAP, HFS_EXCLUSIVE_LOCK);
+       vp = vcb->allocationsRefNum;
+       fp = VTOF(vp);
+       bcopy(&fp->ff_data, &forkdata, sizeof(forkdata));
+
+       /*
+        * Calculate additional space required (if any) by allocation bitmap.
+        */
+       oldBitmapSize = fp->ff_size;
+       bitmapblks = roundup((newblkcnt+7) / 8, vcb->vcbVBMIOSize) / vcb->blockSize;
+       if (bitmapblks > (daddr_t)fp->ff_blocks)
+               bitmapblks -= fp->ff_blocks;
+       else
+               bitmapblks = 0;
+
+       if (bitmapblks > 0) {
+               daddr64_t blkno;
+               daddr_t blkcnt;
+               off_t bytesAdded;
+
+               /*
+                * Get the bitmap's current size (in allocation blocks) so we know
+                * where to start zero filling once the new space is added.  We've
+                * got to do this before the bitmap is grown.
+                */
+               blkno  = (daddr64_t)fp->ff_blocks;
+
+               /*
+                * Try to grow the allocation file in the normal way, using allocation
+                * blocks already existing in the file system.  This way, we might be
+                * able to grow the bitmap contiguously, or at least in the metadata
+                * zone.
+                */
+               error = ExtendFileC(vcb, fp, bitmapblks * vcb->blockSize, 0,
+                               kEFAllMask | kEFNoClumpMask | kEFReserveMask | kEFMetadataMask,
+                               &bytesAdded);
+
+               if (error == 0) {
+                       usedExtendFileC = true;
+               } else {
+                       /*
+                        * If the above allocation failed, fall back to allocating the new
+                        * extent of the bitmap from the space we're going to add.  Since those
+                        * blocks don't yet belong to the file system, we have to update the
+                        * extent list directly, and manually adjust the file size.
+                        */
+                       bytesAdded = 0;
+                       error = AddFileExtent(vcb, fp, vcb->totalBlocks, bitmapblks);
+                       if (error) {
+                               printf("hfs_extendfs: error %d adding extents\n", error);
+                               goto out;
+                       }
+                       fp->ff_blocks += bitmapblks;
+                       VTOC(vp)->c_blocks = fp->ff_blocks;
+                       VTOC(vp)->c_flag |= C_MODIFIED;
+               }
+               
+               /*
+                * Update the allocation file's size to include the newly allocated
+                * blocks.  Note that ExtendFileC doesn't do this, which is why this
+                * statement is outside the above "if" statement.
+                */
+               fp->ff_size += (u_int64_t)bitmapblks * (u_int64_t)vcb->blockSize;
+               
+               /*
+                * Zero out the new bitmap blocks.
+                */
+               {
+       
+                       bp = NULL;
+                       blkcnt = bitmapblks;
+                       while (blkcnt > 0) {
+                               error = (int)buf_meta_bread(vp, blkno, vcb->blockSize, NOCRED, &bp);
+                               if (error) {
+                                       if (bp) {
+                                               buf_brelse(bp);
+                                       }
+                                       break;
+                               }
+                               bzero((char *)buf_dataptr(bp), vcb->blockSize);
+                               buf_markaged(bp);
+                               error = (int)buf_bwrite(bp);
+                               if (error)
+                                       break;
+                               --blkcnt;
+                               ++blkno;
+                       }
+               }
+               if (error) {
+                       printf("hfs_extendfs: error %d  clearing blocks\n", error);
+                       goto out;
+               }
+               /*
+                * Mark the new bitmap space as allocated.
+                *
+                * Note that ExtendFileC will have marked any blocks it allocated, so
+                * this is only needed if we used AddFileExtent.  Also note that this
+                * has to come *after* the zero filling of new blocks in the case where
+                * we used AddFileExtent (since the part of the bitmap we're touching
+                * is in those newly allocated blocks).
+                */
+               if (!usedExtendFileC) {
+                       error = BlockMarkAllocated(vcb, vcb->totalBlocks, bitmapblks);
+                       if (error) {
+                               printf("hfs_extendfs: error %d setting bitmap\n", error);
+                               goto out;
+                       }
+                       vcb->freeBlocks -= bitmapblks;
+               }
+       }
+       /*
+        * Mark the new alternate VH as allocated.
+        */
+       if (vcb->blockSize == 512)
+               error = BlockMarkAllocated(vcb, vcb->totalBlocks + addblks - 2, 2);
+       else
+               error = BlockMarkAllocated(vcb, vcb->totalBlocks + addblks - 1, 1);
+       if (error) {
+               printf("hfs_extendfs: error %d setting bitmap (VH)\n", error);
+               goto out;
+       }
+       /*
+        * Mark the old alternate VH as free.
+        */
+       if (vcb->blockSize == 512)
+               (void) BlockMarkFree(vcb, vcb->totalBlocks - 2, 2);
+       else 
+               (void) BlockMarkFree(vcb, vcb->totalBlocks - 1, 1);
+       /*
+        * Adjust file system variables for new space.
+        */
+       prev_phys_block_count = hfsmp->hfs_phys_block_count;
+       prev_alt_sector = hfsmp->hfs_alt_id_sector;
+
+       vcb->totalBlocks += addblks;
+       vcb->freeBlocks += addblks;
+       hfsmp->hfs_phys_block_count = newsize / sectorsize;
+       hfsmp->hfs_alt_id_sector = (hfsmp->hfsPlusIOPosOffset / sectorsize) +
+                                 HFS_ALT_SECTOR(sectorsize, hfsmp->hfs_phys_block_count);
+       MarkVCBDirty(vcb);
+       error = hfs_flushvolumeheader(hfsmp, MNT_WAIT, HFS_ALTFLUSH);
+       if (error) {
+               printf("hfs_extendfs: couldn't flush volume headers (%d)", error);
+               /*
+                * Restore to old state.
+                */
+               if (usedExtendFileC) {
+                       (void) TruncateFileC(vcb, fp, oldBitmapSize, false);
+               } else {
+                       fp->ff_blocks -= bitmapblks;
+                       fp->ff_size -= (u_int64_t)bitmapblks * (u_int64_t)vcb->blockSize;
+                       /*
+                        * No need to mark the excess blocks free since those bitmap blocks
+                        * are no longer part of the bitmap.  But we do need to undo the
+                        * effect of the "vcb->freeBlocks -= bitmapblks" above.
+                        */
+                       vcb->freeBlocks += bitmapblks;
+               }
+               vcb->totalBlocks -= addblks;
+               vcb->freeBlocks -= addblks;
+               hfsmp->hfs_phys_block_count = prev_phys_block_count;
+               hfsmp->hfs_alt_id_sector = prev_alt_sector;
+               MarkVCBDirty(vcb);
+               if (vcb->blockSize == 512)
+                       (void) BlockMarkAllocated(vcb, vcb->totalBlocks - 2, 2);
+               else
+                       (void) BlockMarkAllocated(vcb, vcb->totalBlocks - 1, 1);
+               goto out;
+       }
+       /*
+        * Invalidate the old alternate volume header.
+        */
+       bp = NULL;
+       if (prev_alt_sector) {
+               if (buf_meta_bread(hfsmp->hfs_devvp, prev_alt_sector, sectorsize,
+                                  NOCRED, &bp) == 0) {
+                       journal_modify_block_start(hfsmp->jnl, bp);
+       
+                       bzero((char *)buf_dataptr(bp) + HFS_ALT_OFFSET(sectorsize), kMDBSize);
+       
+                       journal_modify_block_end(hfsmp->jnl, bp, NULL, NULL);
+               } else if (bp) {
+                       buf_brelse(bp);
+               }
+       }
+       
+       /*
+        * TODO: Adjust the size of the metadata zone based on new volume size?
+        */
+        
+       /*
+        * Adjust the size of hfsmp->hfs_attrdata_vp
+        */
+       if (hfsmp->hfs_attrdata_vp) {
+               struct cnode *attr_cp;
+               struct filefork *attr_fp;
+               
+               if (vnode_get(hfsmp->hfs_attrdata_vp) == 0) {
+                       attr_cp = VTOC(hfsmp->hfs_attrdata_vp);
+                       attr_fp = VTOF(hfsmp->hfs_attrdata_vp);
+                       
+                       attr_cp->c_blocks = newblkcnt;
+                       attr_fp->ff_blocks = newblkcnt;
+                       attr_fp->ff_extents[0].blockCount = newblkcnt;
+                       attr_fp->ff_size = (off_t) newblkcnt * hfsmp->blockSize;
+                       ubc_setsize(hfsmp->hfs_attrdata_vp, attr_fp->ff_size);
+                       vnode_put(hfsmp->hfs_attrdata_vp);
+               }
+       }
+
+out:
+       if (error && fp) {
+               /* Restore allocation fork. */
+               bcopy(&forkdata, &fp->ff_data, sizeof(forkdata));
+               VTOC(vp)->c_blocks = fp->ff_blocks;
+
+       }
+       /*
+          Regardless of whether or not the totalblocks actually increased,
+          we should reset the allocLimit field. If it changed, it will
+          get updated; if not, it will remain the same.
+       */
+       hfsmp->allocLimit = vcb->totalBlocks;
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       hfs_end_transaction(hfsmp);
+
+       return (error);
+}
+
+#define HFS_MIN_SIZE  (32LL * 1024LL * 1024LL)
+
+/*
+ * Truncate a file system (while still mounted).
+ */
+__private_extern__
+int
+hfs_truncatefs(struct hfsmount *hfsmp, u_int64_t newsize, vfs_context_t context)
+{
+       struct  buf *bp = NULL;
+       u_int64_t oldsize;
+       u_int32_t newblkcnt;
+       u_int32_t reclaimblks = 0;
+       int lockflags = 0;
+       int transaction_begun = 0;
+       int error;
+
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+       if (hfsmp->hfs_flags & HFS_RESIZE_IN_PROGRESS) {
+               lck_mtx_unlock(&hfsmp->hfs_mutex);
+               return (EALREADY);
+       }
+       hfsmp->hfs_flags |= HFS_RESIZE_IN_PROGRESS;
+       hfsmp->hfs_resize_filesmoved = 0;
+       hfsmp->hfs_resize_totalfiles = 0;
+       lck_mtx_unlock(&hfsmp->hfs_mutex);
+
+       /*
+        * - Journaled HFS Plus volumes only.
+        * - No embedded volumes.
+        */
+       if ((hfsmp->jnl == NULL) ||
+           (hfsmp->hfsPlusIOPosOffset != 0)) {
+               error = EPERM;
+               goto out;
+       }
+       oldsize = (u_int64_t)hfsmp->totalBlocks * (u_int64_t)hfsmp->blockSize;
+       newblkcnt = newsize / hfsmp->blockSize;
+       reclaimblks = hfsmp->totalBlocks - newblkcnt;
+
+       /* Make sure new size is valid. */
+       if ((newsize < HFS_MIN_SIZE) ||
+           (newsize >= oldsize) ||
+           (newsize % hfsmp->hfs_phys_block_size)) {
+               error = EINVAL;
+               goto out;
+       }
+       /* Make sure there's enough space to work with. */
+       if (reclaimblks >= hfs_freeblks(hfsmp, 1)) {
+               printf("hfs_truncatefs: insufficient space (need %u blocks; have %u blocks)\n", reclaimblks, hfs_freeblks(hfsmp, 1));
+               error = ENOSPC;
+               goto out;
+       }
+       
+       /* Start with a clean journal. */
+       journal_flush(hfsmp->jnl);
+       
+       if (hfs_start_transaction(hfsmp) != 0) {
+               error = EINVAL;
+               goto out;
+       }
+       transaction_begun = 1;
+
+       /*
+        * Prevent new allocations from using the part we're trying to truncate.
+        *
+        * NOTE: allocLimit is set to the allocation block number where the new
+        * alternate volume header will be.  That way there will be no files to
+        * interfere with allocating the new alternate volume header, and no files
+        * in the allocation blocks beyond (i.e. the blocks we're trying to
+        * truncate away.
+        */
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+       if (hfsmp->blockSize == 512) 
+               hfsmp->allocLimit = newblkcnt - 2;
+       else
+               hfsmp->allocLimit = newblkcnt - 1;
+       hfsmp->freeBlocks -= reclaimblks;
+       lck_mtx_unlock(&hfsmp->hfs_mutex);
+       
+       /*
+        * Look for files that have blocks at or beyond the location of the
+        * new alternate volume header.
+        */
+       if (hfs_isallocated(hfsmp, hfsmp->allocLimit, reclaimblks)) {
+               /*
+                * hfs_reclaimspace will use separate transactions when
+                * relocating files (so we don't overwhelm the journal).
+                */
+               hfs_end_transaction(hfsmp);
+               transaction_begun = 0;
+
+               /* Attempt to reclaim some space. */ 
+               if (hfs_reclaimspace(hfsmp, hfsmp->allocLimit, reclaimblks, context) != 0) {
+                       printf("hfs_truncatefs: couldn't reclaim space on %s\n", hfsmp->vcbVN);
+                       error = ENOSPC;
+                       goto out;
+               }
+               if (hfs_start_transaction(hfsmp) != 0) {
+                       error = EINVAL;
+                       goto out;
+               }
+               transaction_begun = 1;
+               
+               /* Check if we're clear now. */
+               if (hfs_isallocated(hfsmp, hfsmp->allocLimit, reclaimblks)) {
+                       printf("hfs_truncatefs: didn't reclaim enough space on %s\n", hfsmp->vcbVN);
+                       error = EAGAIN;  /* tell client to try again */
+                       goto out;
+               }
+       }
+       
+       /*
+        * Note: we take the attributes lock in case we have an attribute data vnode
+        * which needs to change size.
+        */
+       lockflags = hfs_systemfile_lock(hfsmp, SFL_ATTRIBUTE | SFL_EXTENTS | SFL_BITMAP, HFS_EXCLUSIVE_LOCK);
+
+       /*
+        * Mark the old alternate volume header as free. 
+        * We don't bother shrinking allocation bitmap file.
+        */
+       if (hfsmp->blockSize == 512) 
+               (void) BlockMarkFree(hfsmp, hfsmp->totalBlocks - 2, 2);
+       else 
+               (void) BlockMarkFree(hfsmp, hfsmp->totalBlocks - 1, 1);
+
+       /*
+        * Allocate last 1KB for alternate volume header.
+        */
+       error = BlockMarkAllocated(hfsmp, hfsmp->allocLimit, (hfsmp->blockSize == 512) ? 2 : 1);
+       if (error) {
+               printf("hfs_truncatefs: Error %d allocating new alternate volume header\n", error);
+               goto out;
+       }
+
+       /*
+        * Invalidate the existing alternate volume header.
+        *
+        * Don't include this in a transaction (don't call journal_modify_block)
+        * since this block will be outside of the truncated file system!
+        */
+       if (hfsmp->hfs_alt_id_sector) {
+               if (buf_meta_bread(hfsmp->hfs_devvp, hfsmp->hfs_alt_id_sector,
+                                  hfsmp->hfs_phys_block_size, NOCRED, &bp) == 0) {
+       
+                       bzero((void*)((char *)buf_dataptr(bp) + HFS_ALT_OFFSET(hfsmp->hfs_phys_block_size)), kMDBSize);
+                       (void) VNOP_BWRITE(bp);
+               } else if (bp) {
+                       buf_brelse(bp);
+               }
+               bp = NULL;
+       }
+
+       /* Log successful shrinking. */
+       printf("hfs_truncatefs: shrank \"%s\" to %d blocks (was %d blocks)\n",
+              hfsmp->vcbVN, newblkcnt, hfsmp->totalBlocks);
+
+       /*
+        * Adjust file system variables and flush them to disk.
+        */
+       hfsmp->totalBlocks = newblkcnt;
+       hfsmp->hfs_phys_block_count = newsize / hfsmp->hfs_phys_block_size;
+       hfsmp->hfs_alt_id_sector = HFS_ALT_SECTOR(hfsmp->hfs_phys_block_size, hfsmp->hfs_phys_block_count);
+       MarkVCBDirty(hfsmp);
+       error = hfs_flushvolumeheader(hfsmp, MNT_WAIT, HFS_ALTFLUSH);
+       if (error)
+               panic("hfs_truncatefs: unexpected error flushing volume header (%d)\n", error);
+       
+       /*
+        * TODO: Adjust the size of the metadata zone based on new volume size?
+        */
+        
+       /*
+        * Adjust the size of hfsmp->hfs_attrdata_vp
+        */
+       if (hfsmp->hfs_attrdata_vp) {
+               struct cnode *cp;
+               struct filefork *fp;
+               
+               if (vnode_get(hfsmp->hfs_attrdata_vp) == 0) {
+                       cp = VTOC(hfsmp->hfs_attrdata_vp);
+                       fp = VTOF(hfsmp->hfs_attrdata_vp);
+                       
+                       cp->c_blocks = newblkcnt;
+                       fp->ff_blocks = newblkcnt;
+                       fp->ff_extents[0].blockCount = newblkcnt;
+                       fp->ff_size = (off_t) newblkcnt * hfsmp->blockSize;
+                       ubc_setsize(hfsmp->hfs_attrdata_vp, fp->ff_size);
+                       vnode_put(hfsmp->hfs_attrdata_vp);
+               }
+       }
+       
+out:
+       if (error)
+               hfsmp->freeBlocks += reclaimblks;
+       
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+       hfsmp->allocLimit = hfsmp->totalBlocks;
+       if (hfsmp->nextAllocation >= hfsmp->allocLimit)
+               hfsmp->nextAllocation = hfsmp->hfs_metazone_end + 1;
+       hfsmp->hfs_flags &= ~HFS_RESIZE_IN_PROGRESS;
+       lck_mtx_unlock(&hfsmp->hfs_mutex);
+       
+       if (lockflags) {
+               hfs_systemfile_unlock(hfsmp, lockflags);
+       }
+       if (transaction_begun) {
+               hfs_end_transaction(hfsmp);
+               journal_flush(hfsmp->jnl);
+       }
+
+       return (error);
+}
+
+
+/*
+ * Invalidate the physical block numbers associated with buffer cache blocks
+ * in the given extent of the given vnode.
+ */
+struct hfs_inval_blk_no {
+       daddr64_t sectorStart;
+       daddr64_t sectorCount;
+};
+static int
+hfs_invalidate_block_numbers_callback(buf_t bp, void *args_in)
+{
+       daddr64_t blkno;
+       struct hfs_inval_blk_no *args;
+       
+       blkno = buf_blkno(bp);
+       args = args_in;
+       
+       if (blkno >= args->sectorStart && blkno < args->sectorStart+args->sectorCount)
+               buf_setblkno(bp, buf_lblkno(bp));
+
+       return BUF_RETURNED;
+}
+static void
+hfs_invalidate_sectors(struct vnode *vp, daddr64_t sectorStart, daddr64_t sectorCount)
+{
+       struct hfs_inval_blk_no args;
+       args.sectorStart = sectorStart;
+       args.sectorCount = sectorCount;
+       
+       buf_iterate(vp, hfs_invalidate_block_numbers_callback, BUF_SCAN_DIRTY|BUF_SCAN_CLEAN, &args);
+}
+
+
+/*
+ * Copy the contents of an extent to a new location.  Also invalidates the
+ * physical block number of any buffer cache block in the copied extent
+ * (so that if the block is written, it will go through VNOP_BLOCKMAP to
+ * determine the new physical block number).
+ */
+static int
+hfs_copy_extent(
+       struct hfsmount *hfsmp,
+       struct vnode *vp,               /* The file whose extent is being copied. */
+       u_int32_t oldStart,             /* The start of the source extent. */
+       u_int32_t newStart,             /* The start of the destination extent. */
+       u_int32_t blockCount,   /* The number of allocation blocks to copy. */
+       vfs_context_t context)
+{
+       int err = 0;
+       size_t bufferSize;
+       void *buffer = NULL;
+       struct vfsioattr ioattr;
+       buf_t bp = NULL;
+       off_t resid;
+       size_t ioSize;
+       u_int32_t ioSizeSectors;        /* Device sectors in this I/O */
+       daddr64_t srcSector, destSector;
+       u_int32_t sectorsPerBlock = hfsmp->blockSize / hfsmp->hfs_phys_block_size;
+
+       /*
+        * Sanity check that we have locked the vnode of the file we're copying.
+        *
+        * But since hfs_systemfile_lock() doesn't actually take the lock on
+        * the allocation file if a journal is active, ignore the check if the
+        * file being copied is the allocation file.
+        */
+       struct cnode *cp = VTOC(vp);
+       if (cp != hfsmp->hfs_allocation_cp && cp->c_lockowner != current_thread())
+               panic("hfs_copy_extent: vp=%p (cp=%p) not owned?\n", vp, cp);
+
+       /*
+        * Wait for any in-progress writes to this vnode to complete, so that we'll
+        * be copying consistent bits.  (Otherwise, it's possible that an async
+        * write will complete to the old extent after we read from it.  That
+        * could lead to corruption.)
+        */
+       err = vnode_waitforwrites(vp, 0, 0, 0, "hfs_copy_extent");
+       if (err) {
+               printf("hfs_copy_extent: Error %d from vnode_waitforwrites\n", err);
+               return err;
+       }
+       
+       /*
+        * Determine the I/O size to use
+        *
+        * NOTE: Many external drives will result in an ioSize of 128KB.
+        * TODO: Should we use a larger buffer, doing several consecutive
+        * reads, then several consecutive writes?
+        */
+       vfs_ioattr(hfsmp->hfs_mp, &ioattr);
+       bufferSize = MIN(ioattr.io_maxreadcnt, ioattr.io_maxwritecnt);
+       if (kmem_alloc(kernel_map, (vm_offset_t*) &buffer, bufferSize))
+               return ENOMEM;
+
+       /* Get a buffer for doing the I/O */
+       bp = buf_alloc(hfsmp->hfs_devvp);
+       buf_setdataptr(bp, (uintptr_t)buffer);
+       
+       resid = (off_t) blockCount * (off_t) hfsmp->blockSize;
+       srcSector = (daddr64_t) oldStart * hfsmp->blockSize / hfsmp->hfs_phys_block_size;
+       destSector = (daddr64_t) newStart * hfsmp->blockSize / hfsmp->hfs_phys_block_size;
+       while (resid > 0) {
+               ioSize = MIN(bufferSize, resid);
+               ioSizeSectors = ioSize / hfsmp->hfs_phys_block_size;
+               
+               /* Prepare the buffer for reading */
+               buf_reset(bp, B_READ);
+               buf_setsize(bp, ioSize);
+               buf_setcount(bp, ioSize);
+               buf_setblkno(bp, srcSector);
+               buf_setlblkno(bp, srcSector);
+               
+               /* Do the read */
+               err = VNOP_STRATEGY(bp);
+               if (!err)
+                       err = buf_biowait(bp);
+               if (err) {
+                       printf("hfs_copy_extent: Error %d from VNOP_STRATEGY (read)\n", err);
+                       break;
+               }
+               
+               /* Prepare the buffer for writing */
+               buf_reset(bp, B_WRITE);
+               buf_setsize(bp, ioSize);
+               buf_setcount(bp, ioSize);
+               buf_setblkno(bp, destSector);
+               buf_setlblkno(bp, destSector);
+               if (journal_uses_fua(hfsmp->jnl))
+                       buf_markfua(bp);
+                       
+               /* Do the write */
+               vnode_startwrite(hfsmp->hfs_devvp);
+               err = VNOP_STRATEGY(bp);
+               if (!err)
+                       err = buf_biowait(bp);
+               if (err) {
+                       printf("hfs_copy_extent: Error %d from VNOP_STRATEGY (write)\n", err);
+                       break;
+               }
+               
+               resid -= ioSize;
+               srcSector += ioSizeSectors;
+               destSector += ioSizeSectors;
+       }
+       if (bp)
+               buf_free(bp);
+       if (buffer)
+               kmem_free(kernel_map, (vm_offset_t)buffer, bufferSize);
+
+       /* Make sure all writes have been flushed to disk. */
+       if (!journal_uses_fua(hfsmp->jnl)) {
+               err = VNOP_IOCTL(hfsmp->hfs_devvp, DKIOCSYNCHRONIZECACHE, NULL, FWRITE, context);
+               if (err) {
+                       printf("hfs_copy_extent: DKIOCSYNCHRONIZECACHE failed (%d)\n", err);
+                       err = 0;        /* Don't fail the copy. */
+               }
+       }
+
+       if (!err)
+               hfs_invalidate_sectors(vp, (daddr64_t)oldStart*sectorsPerBlock, (daddr64_t)blockCount*sectorsPerBlock);
+
+       return err;
+}
+
+
+/*
+ * Reclaim space at the end of a volume, used by a given system file.
+ *
+ * This routine attempts to move any extent which contains allocation blocks
+ * at or after "startblk."  A separate transaction is used to do the move.
+ * The contents of any moved extents are read and written via the volume's
+ * device vnode -- NOT via "vp."  During the move, moved blocks which are part
+ * of a transaction have their physical block numbers invalidated so they will
+ * eventually be written to their new locations.
+ *
+ * This routine can be used to move overflow extents for the allocation file.
+ *
+ * Inputs:
+ *    hfsmp       The volume being resized.
+ *    startblk    Blocks >= this allocation block need to be moved.
+ *    locks       Which locks need to be taken for the given system file.
+ *    vp          The vnode for the system file.
+ *
+ * Outputs:
+ *    moved       Set to true if any extents were moved.
+ */
+static int
+hfs_relocate_callback(__unused HFSPlusExtentKey *key, HFSPlusExtentRecord *record, HFSPlusExtentRecord *state)
+{
+       bcopy(state, record, sizeof(HFSPlusExtentRecord));
+       return 0;
+}
+static int
+hfs_reclaim_sys_file(struct hfsmount *hfsmp, struct vnode *vp, u_long startblk, int locks, Boolean *moved, vfs_context_t context)
+{
+       int error;
+       int lockflags;
+       int i;
+       u_long datablks;
+       u_long block;
+       u_int32_t oldStartBlock;
+       u_int32_t newStartBlock;
+       u_int32_t blockCount;
+       struct filefork *fp;
+
+       /* If there is no vnode for this file, then there's nothing to do. */   
+       if (vp == NULL)
+               return 0;
+
+       /* printf("hfs_reclaim_sys_file: %.*s\n", VTOC(vp)->c_desc.cd_namelen, VTOC(vp)->c_desc.cd_nameptr); */
+       
+       /* We always need the allocation bitmap and extents B-tree */
+       locks |= SFL_BITMAP | SFL_EXTENTS;
+       
+       error = hfs_start_transaction(hfsmp);
+       if (error) {
+               printf("hfs_reclaim_sys_file: hfs_start_transaction returned %d\n", error);
+               return error;
+       }
+       lockflags = hfs_systemfile_lock(hfsmp, locks, HFS_EXCLUSIVE_LOCK);
+       fp = VTOF(vp);
+       datablks = 0;
+
+       /* Relocate non-overflow extents */
+       for (i = 0; i < kHFSPlusExtentDensity; ++i) {
+               if (fp->ff_extents[i].blockCount == 0)
+                       break;
+               oldStartBlock = fp->ff_extents[i].startBlock;
+               blockCount = fp->ff_extents[i].blockCount;
+               datablks += blockCount;
+               block = oldStartBlock + blockCount;
+               if (block > startblk) {
+                       error = BlockAllocate(hfsmp, 1, blockCount, blockCount, true, true, &newStartBlock, &blockCount);
+                       if (error) {
+                               printf("hfs_reclaim_sys_file: BlockAllocate returned %d\n", error);
+                               goto fail;
+                       }
+                       if (blockCount != fp->ff_extents[i].blockCount) {
+                               printf("hfs_reclaim_sys_file: new blockCount=%u, original blockCount=%u", blockCount, fp->ff_extents[i].blockCount);
+                               goto free_fail;
+                       }
+                       error = hfs_copy_extent(hfsmp, vp, oldStartBlock, newStartBlock, blockCount, context);
+                       if (error) {
+                               printf("hfs_reclaim_sys_file: hfs_copy_extent returned %d\n", error);
+                               goto free_fail;
+                       }
+                       fp->ff_extents[i].startBlock = newStartBlock;
+                       VTOC(vp)->c_flag |= C_MODIFIED;
+                       *moved = true;
+                       error = BlockDeallocate(hfsmp, oldStartBlock, blockCount);
+                       if (error) {
+                               /* TODO: Mark volume inconsistent? */
+                               printf("hfs_reclaim_sys_file: BlockDeallocate returned %d\n", error);
+                               goto fail;
+                       }
+                       error = hfs_flushvolumeheader(hfsmp, MNT_WAIT, HFS_ALTFLUSH);
+                       if (error) {
+                               /* TODO: Mark volume inconsistent? */
+                               printf("hfs_reclaim_sys_file: hfs_flushvolumeheader returned %d\n", error);
+                               goto fail;
+                       }
+               }
+       }
+
+       /* Relocate overflow extents (if any) */
+       if (i == kHFSPlusExtentDensity && fp->ff_blocks > datablks) {
+               struct BTreeIterator *iterator = NULL;
+               struct FSBufferDescriptor btdata;
+               HFSPlusExtentRecord record;
+               HFSPlusExtentKey *key;
+               FCB *fcb;
+               u_int32_t fileID;
+               u_int8_t forktype;
+
+               forktype = VNODE_IS_RSRC(vp) ? 0xFF : 0;
+               fileID = VTOC(vp)->c_cnid;
+               if (kmem_alloc(kernel_map, (vm_offset_t*) &iterator, sizeof(*iterator))) {
+                       printf("hfs_reclaim_sys_file: kmem_alloc failed!\n");
+                       error = ENOMEM;
+                       goto fail;
+               }
+
+               bzero(iterator, sizeof(*iterator));
+               key = (HFSPlusExtentKey *) &iterator->key;
+               key->keyLength = kHFSPlusExtentKeyMaximumLength;
+               key->forkType = forktype;
+               key->fileID = fileID;
+               key->startBlock = datablks;
+       
+               btdata.bufferAddress = &record;
+               btdata.itemSize = sizeof(record);
+               btdata.itemCount = 1;
+       
+               fcb = VTOF(hfsmp->hfs_extents_vp);
+
+               error = BTSearchRecord(fcb, iterator, &btdata, NULL, iterator);
+               while (error == 0) {
+                       /* Stop when we encounter a different file or fork. */
+                       if ((key->fileID != fileID) ||
+                               (key->forkType != forktype)) {
+                               break;
+                       }
+                       /* 
+                        * Check if the file overlaps target space.
+                        */
+                       for (i = 0; i < kHFSPlusExtentDensity; ++i) {
+                               if (record[i].blockCount == 0) {
+                                       goto overflow_done;
+                               }
+                               oldStartBlock = record[i].startBlock;
+                               blockCount = record[i].blockCount;
+                               block = oldStartBlock + blockCount;
+                               if (block > startblk) {
+                                       error = BlockAllocate(hfsmp, 1, blockCount, blockCount, true, true, &newStartBlock, &blockCount);
+                                       if (error) {
+                                               printf("hfs_reclaim_sys_file: BlockAllocate returned %d\n", error);
+                                               goto overflow_done;
+                                       }
+                                       if (blockCount != record[i].blockCount) {
+                                               printf("hfs_reclaim_sys_file: new blockCount=%u, original blockCount=%u", blockCount, fp->ff_extents[i].blockCount);
+                                               kmem_free(kernel_map, (vm_offset_t)iterator, sizeof(*iterator));
+                                               goto free_fail;
+                                       }
+                                       error = hfs_copy_extent(hfsmp, vp, oldStartBlock, newStartBlock, blockCount, context);
+                                       if (error) {
+                                               printf("hfs_reclaim_sys_file: hfs_copy_extent returned %d\n", error);
+                                               kmem_free(kernel_map, (vm_offset_t)iterator, sizeof(*iterator));
+                                               goto free_fail;
+                                       }
+                                       record[i].startBlock = newStartBlock;
+                                       VTOC(vp)->c_flag |= C_MODIFIED;
+                                       *moved = true;
+                                       /*
+                                        * NOTE: To support relocating overflow extents of the
+                                        * allocation file, we must update the BTree record BEFORE
+                                        * deallocating the old extent so that BlockDeallocate will
+                                        * use the extent's new location to calculate physical block
+                                        * numbers.  (This is for the case where the old extent's
+                                        * bitmap bits actually reside in the extent being moved.)
+                                        */
+                                       error = BTUpdateRecord(fcb, iterator, (IterateCallBackProcPtr) hfs_relocate_callback, &record);
+                                       if (error) {
+                                               /* TODO: Mark volume inconsistent? */
+                                               printf("hfs_reclaim_sys_file: BTUpdateRecord returned %d\n", error);
+                                               goto overflow_done;
+                                       }
+                                       error = BlockDeallocate(hfsmp, oldStartBlock, blockCount);
+                                       if (error) {
+                                               /* TODO: Mark volume inconsistent? */
+                                               printf("hfs_reclaim_sys_file: BlockDeallocate returned %d\n", error);
+                                               goto overflow_done;
+                                       }
+                               }
+                       }
+                       /* Look for more records. */
+                       error = BTIterateRecord(fcb, kBTreeNextRecord, iterator, &btdata, NULL);
+                       if (error == btNotFound) {
+                               error = 0;
+                               break;
+                       }
+               }
+overflow_done:
+               kmem_free(kernel_map, (vm_offset_t)iterator, sizeof(*iterator));
+               if (error) {
+                       goto fail;
+               }
+       }
+       
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       error = hfs_end_transaction(hfsmp);
+       if (error) {
+               printf("hfs_reclaim_sys_file: hfs_end_transaction returned %d\n", error);
+       }
+
+       return error;
+
+free_fail:
+       (void) BlockDeallocate(hfsmp, newStartBlock, blockCount);
+fail:
+       (void) hfs_systemfile_unlock(hfsmp, lockflags);
+       (void) hfs_end_transaction(hfsmp);
+       return error;
+}
+
+
+/*
+ * This journal_relocate callback updates the journal info block to point
+ * at the new journal location.  This write must NOT be done using the
+ * transaction.  We must write the block immediately.  We must also force
+ * it to get to the media so that the new journal location will be seen by
+ * the replay code before we can safely let journaled blocks be written
+ * to their normal locations.
+ *
+ * The tests for journal_uses_fua below are mildly hacky.  Since the journal
+ * and the file system are both on the same device, I'm leveraging what
+ * the journal has decided about FUA.
+ */
+struct hfs_journal_relocate_args {
+       struct hfsmount *hfsmp;
+       vfs_context_t context;
+       u_int32_t newStartBlock;
+};
+
+static errno_t
+hfs_journal_relocate_callback(void *_args)
+{
+       int error;
+       struct hfs_journal_relocate_args *args = _args;
+       struct hfsmount *hfsmp = args->hfsmp;
+       buf_t bp;
+       JournalInfoBlock *jibp;
+
+       error = buf_meta_bread(hfsmp->hfs_devvp,
+               hfsmp->vcbJinfoBlock * (hfsmp->blockSize/hfsmp->hfs_phys_block_size),
+               hfsmp->blockSize, vfs_context_ucred(args->context), &bp);
+       if (error) {
+               printf("hfs_reclaim_journal_file: failed to read JIB (%d)\n", error);
+               return error;
+       }
+       jibp = (JournalInfoBlock*) buf_dataptr(bp);
+       jibp->offset = SWAP_BE64((u_int64_t)args->newStartBlock * hfsmp->blockSize);
+       jibp->size = SWAP_BE64(hfsmp->jnl_size);
+       if (journal_uses_fua(hfsmp->jnl))
+               buf_markfua(bp);
+       error = buf_bwrite(bp);
+       if (error) {
+               printf("hfs_reclaim_journal_file: failed to write JIB (%d)\n", error);
+               return error;
+       }
+       if (!journal_uses_fua(hfsmp->jnl)) {
+               error = VNOP_IOCTL(hfsmp->hfs_devvp, DKIOCSYNCHRONIZECACHE, NULL, FWRITE, args->context);
+               if (error) {
+                       printf("hfs_reclaim_journal_file: DKIOCSYNCHRONIZECACHE failed (%d)\n", error);
+                       error = 0;              /* Don't fail the operation. */
+               }
+       }
+
+       return error;
+}
+
+
+static int
+hfs_reclaim_journal_file(struct hfsmount *hfsmp, vfs_context_t context)
+{
+       int error;
+       int lockflags;
+       u_int32_t newStartBlock;
+       u_int32_t oldBlockCount;
+       u_int32_t newBlockCount;
+       struct cat_desc journal_desc;
+       struct cat_attr journal_attr;
+       struct cat_fork journal_fork;
+       struct hfs_journal_relocate_args callback_args;
+
+       error = hfs_start_transaction(hfsmp);
+       if (error) {
+               printf("hfs_reclaim_journal_file: hfs_start_transaction returned %d\n", error);
+               return error;
+       }
+       lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG | SFL_BITMAP, HFS_EXCLUSIVE_LOCK);
+       
+       oldBlockCount = hfsmp->jnl_size / hfsmp->blockSize;
+       
+       /* TODO: Allow the journal to change size based on the new volume size. */
+       error = BlockAllocate(hfsmp, 1, oldBlockCount, oldBlockCount, true, true, &newStartBlock, &newBlockCount);
+       if (error) {
+               printf("hfs_reclaim_journal_file: BlockAllocate returned %d\n", error);
+               goto fail;
+       }
+       if (newBlockCount != oldBlockCount) {
+               printf("hfs_reclaim_journal_file: newBlockCount != oldBlockCount (%u, %u)\n", newBlockCount, oldBlockCount);
+               goto free_fail;
+       }
+       
+       error = BlockDeallocate(hfsmp, hfsmp->jnl_start, oldBlockCount);
+       if (error) {
+               printf("hfs_reclaim_journal_file: BlockDeallocate returned %d\n", error);
+               goto free_fail;
+       }
+
+       /* Update the catalog record for .journal */
+       error = cat_idlookup(hfsmp, hfsmp->hfs_jnlfileid, 1, &journal_desc, &journal_attr, &journal_fork);
+       if (error) {
+               printf("hfs_reclaim_journal_file: cat_idlookup returned %d\n", error);
+               goto free_fail;
+       }
+       journal_fork.cf_size = newBlockCount * hfsmp->blockSize;
+       journal_fork.cf_extents[0].startBlock = newStartBlock;
+       journal_fork.cf_extents[0].blockCount = newBlockCount;
+       journal_fork.cf_blocks = newBlockCount;
+       error = cat_update(hfsmp, &journal_desc, &journal_attr, &journal_fork, NULL);
+       cat_releasedesc(&journal_desc);  /* all done with cat descriptor */
+       if (error) {
+               printf("hfs_reclaim_journal_file: cat_update returned %d\n", error);
+               goto free_fail;
+       }
+       callback_args.hfsmp = hfsmp;
+       callback_args.context = context;
+       callback_args.newStartBlock = newStartBlock;
+       
+       error = journal_relocate(hfsmp->jnl, (off_t)newStartBlock*hfsmp->blockSize,
+               (off_t)newBlockCount*hfsmp->blockSize, 0,
+               hfs_journal_relocate_callback, &callback_args);
+       if (error) {
+               /* NOTE: journal_relocate will mark the journal invalid. */
+               printf("hfs_reclaim_journal_file: journal_relocate returned %d\n", error);
+               goto fail;
+       }
+       hfsmp->jnl_start = newStartBlock;
+       hfsmp->jnl_size = (off_t)newBlockCount * hfsmp->blockSize;
+
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       error = hfs_end_transaction(hfsmp);
+       if (error) {
+               printf("hfs_reclaim_journal_file: hfs_end_transaction returned %d\n", error);
+       }
+       
+       return error;
+
+free_fail:
+       (void) BlockDeallocate(hfsmp, newStartBlock, newBlockCount);
+fail:
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       (void) hfs_end_transaction(hfsmp);
+       return error;
+}
+
+
+/*
+ * Move the journal info block to a new location.  We have to make sure the
+ * new copy of the journal info block gets to the media first, then change
+ * the field in the volume header and the catalog record.
+ */
+static int
+hfs_reclaim_journal_info_block(struct hfsmount *hfsmp, vfs_context_t context)
+{
+       int error;
+       int lockflags;
+       u_int32_t newBlock;
+       u_int32_t blockCount;
+       struct cat_desc jib_desc;
+       struct cat_attr jib_attr;
+       struct cat_fork jib_fork;
+       buf_t old_bp, new_bp;
+       
+       error = hfs_start_transaction(hfsmp);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: hfs_start_transaction returned %d\n", error);
+               return error;
+       }
+       lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG | SFL_BITMAP, HFS_EXCLUSIVE_LOCK);
+       
+       error = BlockAllocate(hfsmp, 1, 1, 1, true, true, &newBlock, &blockCount);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: BlockAllocate returned %d\n", error);
+               goto fail;
+       }
+       if (blockCount != 1) {
+               printf("hfs_reclaim_journal_info_block: blockCount != 1 (%u)\n", blockCount);
+               goto free_fail;
+       }
+       error = BlockDeallocate(hfsmp, hfsmp->vcbJinfoBlock, 1);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: BlockDeallocate returned %d\n", error);
+               goto free_fail;
+       }
+       
+       /* Copy the old journal info block content to the new location */
+       error = buf_meta_bread(hfsmp->hfs_devvp,
+               hfsmp->vcbJinfoBlock * (hfsmp->blockSize/hfsmp->hfs_phys_block_size),
+               hfsmp->blockSize, vfs_context_ucred(context), &old_bp);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: failed to read JIB (%d)\n", error);
+               goto free_fail;
+       }
+       new_bp = buf_getblk(hfsmp->hfs_devvp,
+               newBlock * (hfsmp->blockSize/hfsmp->hfs_phys_block_size),
+               hfsmp->blockSize, 0, 0, BLK_META);
+       bcopy((char*)buf_dataptr(old_bp), (char*)buf_dataptr(new_bp), hfsmp->blockSize);
+       buf_brelse(old_bp);
+       if (journal_uses_fua(hfsmp->jnl))
+               buf_markfua(new_bp);
+       error = buf_bwrite(new_bp);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: failed to write new JIB (%d)\n", error);
+               goto free_fail;
+       }
+       if (!journal_uses_fua(hfsmp->jnl)) {
+               error = VNOP_IOCTL(hfsmp->hfs_devvp, DKIOCSYNCHRONIZECACHE, NULL, FWRITE, context);
+               if (error) {
+                       printf("hfs_reclaim_journal_info_block: DKIOCSYNCHRONIZECACHE failed (%d)\n", error);
+                       /* Don't fail the operation. */
+               }
+       }
+       
+       /* Update the catalog record for .journal_info_block */
+       error = cat_idlookup(hfsmp, hfsmp->hfs_jnlinfoblkid, 1, &jib_desc, &jib_attr, &jib_fork);
+       if (error) {
+               printf("hfs_reclaim_journal_file: cat_idlookup returned %d\n", error);
+               goto fail;
+       }
+       jib_fork.cf_size = hfsmp->blockSize;
+       jib_fork.cf_extents[0].startBlock = newBlock;
+       jib_fork.cf_extents[0].blockCount = 1;
+       jib_fork.cf_blocks = 1;
+       error = cat_update(hfsmp, &jib_desc, &jib_attr, &jib_fork, NULL);
+       cat_releasedesc(&jib_desc);  /* all done with cat descriptor */
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: cat_update returned %d\n", error);
+               goto fail;
+       }
+       
+       /* Update the pointer to the journal info block in the volume header. */
+       hfsmp->vcbJinfoBlock = newBlock;
+       error = hfs_flushvolumeheader(hfsmp, MNT_WAIT, HFS_ALTFLUSH);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: hfs_flushvolumeheader returned %d\n", error);
+               goto fail;
+       }
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       error = hfs_end_transaction(hfsmp);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: hfs_end_transaction returned %d\n", error);
+       }
+       error = journal_flush(hfsmp->jnl);
+       if (error) {
+               printf("hfs_reclaim_journal_info_block: journal_flush returned %d\n", error);
+       }
+       return error;
+
+free_fail:
+       (void) BlockDeallocate(hfsmp, newBlock, blockCount);
+fail:
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       (void) hfs_end_transaction(hfsmp);
+       return error;
+}
+
+
+/*
+ * Reclaim space at the end of a file system.
+ */
+static int
+hfs_reclaimspace(struct hfsmount *hfsmp, u_long startblk, u_long reclaimblks, vfs_context_t context)
+{
+       struct vnode *vp = NULL;
+       FCB *fcb;
+       struct BTreeIterator * iterator = NULL;
+       struct FSBufferDescriptor btdata;
+       struct HFSPlusCatalogFile filerec;
+       u_int32_t  saved_next_allocation;
+       cnid_t * cnidbufp;
+       size_t cnidbufsize;
+       int filecnt = 0;
+       int maxfilecnt;
+       u_long block;
+       u_long datablks;
+       u_long rsrcblks;
+       u_long blkstomove = 0;
+       int lockflags;
+       int i;
+       int error;
+       int lastprogress = 0;
+       Boolean system_file_moved = false;
+
+       /* Relocate extents of the Allocation file if they're in the way. */
+       error = hfs_reclaim_sys_file(hfsmp, hfsmp->hfs_allocation_vp, startblk, SFL_BITMAP, &system_file_moved, context);
+       if (error) {
+               printf("hfs_reclaimspace: reclaim allocation file returned %d\n", error);
+               return error;
+       }
+       /* Relocate extents of the Extents B-tree if they're in the way. */
+       error = hfs_reclaim_sys_file(hfsmp, hfsmp->hfs_extents_vp, startblk, SFL_EXTENTS, &system_file_moved, context);
+       if (error) {
+               printf("hfs_reclaimspace: reclaim extents b-tree returned %d\n", error);
+               return error;
+       }
+       /* Relocate extents of the Catalog B-tree if they're in the way. */
+       error = hfs_reclaim_sys_file(hfsmp, hfsmp->hfs_catalog_vp, startblk, SFL_CATALOG, &system_file_moved, context);
+       if (error) {
+               printf("hfs_reclaimspace: reclaim catalog b-tree returned %d\n", error);
+               return error;
+       }
+       /* Relocate extents of the Attributes B-tree if they're in the way. */
+       error = hfs_reclaim_sys_file(hfsmp, hfsmp->hfs_attribute_vp, startblk, SFL_ATTRIBUTE, &system_file_moved, context);
+       if (error) {
+               printf("hfs_reclaimspace: reclaim attribute b-tree returned %d\n", error);
+               return error;
+       }
+       /* Relocate extents of the Startup File if there is one and they're in the way. */
+       error = hfs_reclaim_sys_file(hfsmp, hfsmp->hfs_startup_vp, startblk, SFL_STARTUP, &system_file_moved, context);
+       if (error) {
+               printf("hfs_reclaimspace: reclaim startup file returned %d\n", error);
+               return error;
+       }
+       
+       /*
+        * We need to make sure the alternate volume header gets flushed if we moved
+        * any extents in the volume header.  But we need to do that before
+        * shrinking the size of the volume, or else the journal code will panic
+        * with an invalid (too large) block number.
+        *
+        * Note that system_file_moved will be set if ANY extent was moved, even
+        * if it was just an overflow extent.  In this case, the journal_flush isn't
+        * strictly required, but shouldn't hurt.
+        */
+       if (system_file_moved)
+               journal_flush(hfsmp->jnl);
+
+       if (hfsmp->jnl_start + (hfsmp->jnl_size / hfsmp->blockSize) > startblk) {
+               error = hfs_reclaim_journal_file(hfsmp, context);
+               if (error) {
+                       printf("hfs_reclaimspace: hfs_reclaim_journal_file failed (%d)\n", error);
+                       return error;
+               }
+       }
+       
+       if (hfsmp->vcbJinfoBlock >= startblk) {
+               error = hfs_reclaim_journal_info_block(hfsmp, context);
+               if (error) {
+                       printf("hfs_reclaimspace: hfs_reclaim_journal_info_block failed (%d)\n", error);
+                       return error;
+               }
+       }
+       
+       /* For now move a maximum of 250,000 files. */
+       maxfilecnt = MIN(hfsmp->hfs_filecount, 250000);
+       maxfilecnt = MIN((u_long)maxfilecnt, reclaimblks);
+       cnidbufsize = maxfilecnt * sizeof(cnid_t);
+       if (kmem_alloc(kernel_map, (vm_offset_t *)&cnidbufp, cnidbufsize)) {
+               return (ENOMEM);
+       }       
+       if (kmem_alloc(kernel_map, (vm_offset_t *)&iterator, sizeof(*iterator))) {
+               kmem_free(kernel_map, (vm_offset_t)cnidbufp, cnidbufsize);
+               return (ENOMEM);
+       }       
+
+       saved_next_allocation = hfsmp->nextAllocation;
+       HFS_UPDATE_NEXT_ALLOCATION(hfsmp, hfsmp->hfs_metazone_start);
+
+       fcb = VTOF(hfsmp->hfs_catalog_vp);
+       bzero(iterator, sizeof(*iterator));
+
+       btdata.bufferAddress = &filerec;
+       btdata.itemSize = sizeof(filerec);
+       btdata.itemCount = 1;
+
+       /* Keep the Catalog and extents files locked during iteration. */
+       lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG | SFL_EXTENTS, HFS_SHARED_LOCK);
+
+       error = BTIterateRecord(fcb, kBTreeFirstRecord, iterator, NULL, NULL);
+       if (error) {
+               goto end_iteration;
+       }
+       /*
+        * Iterate over all the catalog records looking for files
+        * that overlap into the space we're trying to free up.
+        */
+       for (filecnt = 0; filecnt < maxfilecnt; ) {
+               error = BTIterateRecord(fcb, kBTreeNextRecord, iterator, &btdata, NULL);
+               if (error) {
+                       if (error == fsBTRecordNotFoundErr || error == fsBTEndOfIterationErr) {
+                               error = 0;                              
+                       }
+                       break;
+               }
+               if (filerec.recordType != kHFSPlusFileRecord) {
+                       continue;
+               }
+               datablks = rsrcblks = 0;
+               /* 
+                * Check if either fork overlaps target space.
+                */
+               for (i = 0; i < kHFSPlusExtentDensity; ++i) {
+                       if (filerec.dataFork.extents[i].blockCount != 0) {
+                               datablks += filerec.dataFork.extents[i].blockCount;
+                               block = filerec.dataFork.extents[i].startBlock +
+                                               filerec.dataFork.extents[i].blockCount;
+                               if (block >= startblk) {
+                                       if ((filerec.fileID == hfsmp->hfs_jnlfileid) ||
+                                               (filerec.fileID == hfsmp->hfs_jnlinfoblkid)) {
+                                               printf("hfs_reclaimspace: cannot move active journal\n");
+                                               error = EPERM;
+                                               goto end_iteration;
+                                       }
+                                       cnidbufp[filecnt++] = filerec.fileID;
+                                       blkstomove += filerec.dataFork.totalBlocks;
+                                       break;
+                               }
+                       }
+                       if (filerec.resourceFork.extents[i].blockCount != 0) {
+                               rsrcblks += filerec.resourceFork.extents[i].blockCount;
+                               block = filerec.resourceFork.extents[i].startBlock +
+                                               filerec.resourceFork.extents[i].blockCount;
+                               if (block >= startblk) {
+                                       cnidbufp[filecnt++] = filerec.fileID;
+                                       blkstomove += filerec.resourceFork.totalBlocks;
+                                       break;
+                               }
+                       }
+               }
+               /*
+                * Check for any overflow extents that overlap.
+                */
+               if (i == kHFSPlusExtentDensity) {
+                       if (filerec.dataFork.totalBlocks > datablks) {
+                               if (hfs_overlapped_overflow_extents(hfsmp, startblk, datablks, filerec.fileID, 0)) {
+                                       cnidbufp[filecnt++] = filerec.fileID;
+                                       blkstomove += filerec.dataFork.totalBlocks;
+                               }
+                       } else if (filerec.resourceFork.totalBlocks > rsrcblks) {
+                               if (hfs_overlapped_overflow_extents(hfsmp, startblk, rsrcblks, filerec.fileID, 1)) {
+                                       cnidbufp[filecnt++] = filerec.fileID;
+                                       blkstomove += filerec.resourceFork.totalBlocks;
+                               }
+                       }
+               }
+       }
+
+end_iteration:
+       if (filecnt == 0 && !system_file_moved) {
+               printf("hfs_reclaimspace: no files moved\n");
+               error = ENOSPC;
+       }
+       /* All done with catalog. */
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       if (error || filecnt == 0)
+               goto out;
+
+       /*
+        * Double check space requirements to make sure
+        * there is enough space to relocate any files
+        * that reside in the reclaim area.
+        *
+        *                                          Blocks To Move --------------
+        *                                                            |    |    |
+        *                                                            V    V    V
+        * ------------------------------------------------------------------------
+        * |                                                        | /   ///  // |
+        * |                                                        | /   ///  // |
+        * |                                                        | /   ///  // |
+        * ------------------------------------------------------------------------
+        *
+        * <------------------- New Total Blocks ------------------><-- Reclaim -->
+        *
+        * <------------------------ Original Total Blocks ----------------------->
+        *
+        */
+       if (blkstomove >= hfs_freeblks(hfsmp, 1)) {
+               printf("hfs_truncatefs: insufficient space (need %lu blocks; have %u blocks)\n", blkstomove, hfs_freeblks(hfsmp, 1));
+               error = ENOSPC;
+               goto out;
+       }
+       hfsmp->hfs_resize_filesmoved = 0;
+       hfsmp->hfs_resize_totalfiles = filecnt;
+       
+       /* Now move any files that are in the way. */
+       for (i = 0; i < filecnt; ++i) {
+               struct vnode * rvp;
+
+               if (hfs_vget(hfsmp, cnidbufp[i], &vp, 0) != 0)
+                       continue;
+
+               /* Relocate any data fork blocks. */
+               if (VTOF(vp)->ff_blocks > 0) {
+                       error = hfs_relocate(vp, hfsmp->hfs_metazone_end + 1, kauth_cred_get(), current_proc());
+               }
+               if (error) 
+                       break;
+
+               /* Relocate any resource fork blocks. */
+               if ((VTOC((vp))->c_blocks - VTOF((vp))->ff_blocks) > 0) {
+                       error = hfs_vgetrsrc(hfsmp, vp, &rvp, TRUE);
+                       if (error)
+                               break;
+                       error = hfs_relocate(rvp, hfsmp->hfs_metazone_end + 1, kauth_cred_get(), current_proc());
+                       VTOC(rvp)->c_flag |= C_NEED_RVNODE_PUT;
+                       if (error)
+                               break;
+               }
+               hfs_unlock(VTOC(vp));
+               vnode_put(vp);
+               vp = NULL;
+
+               ++hfsmp->hfs_resize_filesmoved;
+
+               /* Report intermediate progress. */
+               if (filecnt > 100) {
+                       int progress;
+
+                       progress = (i * 100) / filecnt;
+                       if (progress > (lastprogress + 9)) {
+                               printf("hfs_reclaimspace: %d%% done...\n", progress);
+                               lastprogress = progress;
+                       }
+               }
+       }
+       if (vp) {
+               hfs_unlock(VTOC(vp));
+               vnode_put(vp);
+               vp = NULL;
+       }
+       if (hfsmp->hfs_resize_filesmoved != 0) {
+               printf("hfs_reclaimspace: relocated %d files on \"%s\"\n",
+                      (int)hfsmp->hfs_resize_filesmoved, hfsmp->vcbVN);
+       }
+out:
+       kmem_free(kernel_map, (vm_offset_t)iterator, sizeof(*iterator));
+       kmem_free(kernel_map, (vm_offset_t)cnidbufp, cnidbufsize);
+
+       /*
+        * Restore the roving allocation pointer on errors.
+        * (but only if we didn't move any files)
+        */
+       if (error && hfsmp->hfs_resize_filesmoved == 0) {
+               HFS_UPDATE_NEXT_ALLOCATION(hfsmp, saved_next_allocation);
+       }
+       return (error);
+}
+
+
+/*
+ * Check if there are any overflow extents that overlap.
+ */
+static int
+hfs_overlapped_overflow_extents(struct hfsmount *hfsmp, u_int32_t startblk, u_int32_t catblks, u_int32_t fileID, int rsrcfork)
+{
+       struct BTreeIterator * iterator = NULL;
+       struct FSBufferDescriptor btdata;
+       HFSPlusExtentRecord extrec;
+       HFSPlusExtentKey *extkeyptr;
+       FCB *fcb;
+       u_int32_t block;
+       u_int8_t forktype;
+       int overlapped = 0;
+       int i;
+       int error;
+
+       forktype = rsrcfork ? 0xFF : 0;
+       if (kmem_alloc(kernel_map, (vm_offset_t *)&iterator, sizeof(*iterator))) {
+               return (0);
+       }       
+       bzero(iterator, sizeof(*iterator));
+       extkeyptr = (HFSPlusExtentKey *)&iterator->key;
+       extkeyptr->keyLength = kHFSPlusExtentKeyMaximumLength;
+       extkeyptr->forkType = forktype;
+       extkeyptr->fileID = fileID;
+       extkeyptr->startBlock = catblks;
+
+       btdata.bufferAddress = &extrec;
+       btdata.itemSize = sizeof(extrec);
+       btdata.itemCount = 1;
+       
+       fcb = VTOF(hfsmp->hfs_extents_vp);
+
+       error = BTSearchRecord(fcb, iterator, &btdata, NULL, iterator);
+       while (error == 0) {
+               /* Stop when we encounter a different file. */
+               if ((extkeyptr->fileID != fileID) ||
+                   (extkeyptr->forkType != forktype)) {
+                       break;
+               }
+               /* 
+                * Check if the file overlaps target space.
+                */
+               for (i = 0; i < kHFSPlusExtentDensity; ++i) {
+                       if (extrec[i].blockCount == 0) {
+                               break;
+                       }
+                       block = extrec[i].startBlock + extrec[i].blockCount;
+                       if (block >= startblk) {
+                               overlapped = 1;
+                               break;
+                       }
+               }
+               /* Look for more records. */
+               error = BTIterateRecord(fcb, kBTreeNextRecord, iterator, &btdata, NULL);
+       }
+
+       kmem_free(kernel_map, (vm_offset_t)iterator, sizeof(*iterator));
+       return (overlapped);
+}
+
+
+/*
+ * Calculate the progress of a file system resize operation.
+ */
+__private_extern__
+int
+hfs_resize_progress(struct hfsmount *hfsmp, u_int32_t *progress)
+{
+       if ((hfsmp->hfs_flags & HFS_RESIZE_IN_PROGRESS) == 0) {
+               return (ENXIO);
+       }
+
+       if (hfsmp->hfs_resize_totalfiles > 0)
+               *progress = (hfsmp->hfs_resize_filesmoved * 100) / hfsmp->hfs_resize_totalfiles;
+       else
+               *progress = 0;
+
+       return (0);
+}
+
+
+/*
+ * Get file system attributes.
+ */
+static int
+hfs_vfs_getattr(struct mount *mp, struct vfs_attr *fsap, __unused vfs_context_t context)
+{
+#define HFS_ATTR_CMN_VALIDMASK (ATTR_CMN_VALIDMASK & ~(ATTR_CMN_NAMEDATTRCOUNT | ATTR_CMN_NAMEDATTRLIST))
+#define HFS_ATTR_FILE_VALIDMASK (ATTR_FILE_VALIDMASK & ~(ATTR_FILE_FILETYPE | ATTR_FILE_FORKCOUNT | ATTR_FILE_FORKLIST))
+
+       ExtendedVCB *vcb = VFSTOVCB(mp);
+       struct hfsmount *hfsmp = VFSTOHFS(mp);
+       u_long freeCNIDs;
+
+       freeCNIDs = (u_long)0xFFFFFFFF - (u_long)hfsmp->vcbNxtCNID;
+
+       VFSATTR_RETURN(fsap, f_objcount, (u_int64_t)hfsmp->vcbFilCnt + (u_int64_t)hfsmp->vcbDirCnt);
+       VFSATTR_RETURN(fsap, f_filecount, (u_int64_t)hfsmp->vcbFilCnt);
+       VFSATTR_RETURN(fsap, f_dircount, (u_int64_t)hfsmp->vcbDirCnt);
+       VFSATTR_RETURN(fsap, f_maxobjcount, (u_int64_t)0xFFFFFFFF);
+       VFSATTR_RETURN(fsap, f_iosize, (size_t)cluster_max_io_size(mp, 0));
+       VFSATTR_RETURN(fsap, f_blocks, (u_int64_t)hfsmp->totalBlocks);
+       VFSATTR_RETURN(fsap, f_bfree, (u_int64_t)hfs_freeblks(hfsmp, 0));
+       VFSATTR_RETURN(fsap, f_bavail, (u_int64_t)hfs_freeblks(hfsmp, 1));
+       VFSATTR_RETURN(fsap, f_bsize, (u_int32_t)vcb->blockSize);
+       /* XXX needs clarification */
+       VFSATTR_RETURN(fsap, f_bused, hfsmp->totalBlocks - hfs_freeblks(hfsmp, 1));
+       /* Maximum files is constrained by total blocks. */
+       VFSATTR_RETURN(fsap, f_files, (u_int64_t)(hfsmp->totalBlocks - 2));
+       VFSATTR_RETURN(fsap, f_ffree, MIN((u_int64_t)freeCNIDs, (u_int64_t)hfs_freeblks(hfsmp, 1)));
+
+       fsap->f_fsid.val[0] = hfsmp->hfs_raw_dev;
+       fsap->f_fsid.val[1] = vfs_typenum(mp);
+       VFSATTR_SET_SUPPORTED(fsap, f_fsid);
+
+       VFSATTR_RETURN(fsap, f_signature, vcb->vcbSigWord);
+       VFSATTR_RETURN(fsap, f_carbon_fsid, 0);
+
+       if (VFSATTR_IS_ACTIVE(fsap, f_capabilities)) {
+               vol_capabilities_attr_t *cap;
+       
+               cap = &fsap->f_capabilities;
+
+               if (hfsmp->hfs_flags & HFS_STANDARD) {
+                       cap->capabilities[VOL_CAPABILITIES_FORMAT] =
+                               VOL_CAP_FMT_PERSISTENTOBJECTIDS |
+                               VOL_CAP_FMT_CASE_PRESERVING |
+                               VOL_CAP_FMT_FAST_STATFS |
+                               VOL_CAP_FMT_HIDDEN_FILES |
+                               VOL_CAP_FMT_PATH_FROM_ID;
+               } else {
+                       cap->capabilities[VOL_CAPABILITIES_FORMAT] =
+                               VOL_CAP_FMT_PERSISTENTOBJECTIDS |
+                               VOL_CAP_FMT_SYMBOLICLINKS |
+                               VOL_CAP_FMT_HARDLINKS |
+                               VOL_CAP_FMT_JOURNAL |
+                               VOL_CAP_FMT_ZERO_RUNS |
+                               (hfsmp->jnl ? VOL_CAP_FMT_JOURNAL_ACTIVE : 0) |
+                               (hfsmp->hfs_flags & HFS_CASE_SENSITIVE ? VOL_CAP_FMT_CASE_SENSITIVE : 0) |
+                               VOL_CAP_FMT_CASE_PRESERVING |
+                               VOL_CAP_FMT_FAST_STATFS | 
+                               VOL_CAP_FMT_2TB_FILESIZE |
+                               VOL_CAP_FMT_HIDDEN_FILES |
+                               VOL_CAP_FMT_PATH_FROM_ID;
+               }
+               cap->capabilities[VOL_CAPABILITIES_INTERFACES] =
+                       VOL_CAP_INT_SEARCHFS |
+                       VOL_CAP_INT_ATTRLIST |
+                       VOL_CAP_INT_NFSEXPORT |
+                       VOL_CAP_INT_READDIRATTR |
+                       VOL_CAP_INT_EXCHANGEDATA |
+                       VOL_CAP_INT_ALLOCATE |
+                       VOL_CAP_INT_VOL_RENAME |
+                       VOL_CAP_INT_ADVLOCK |
+                       VOL_CAP_INT_FLOCK |
+#if NAMEDSTREAMS
+                       VOL_CAP_INT_EXTENDED_ATTR |
+                       VOL_CAP_INT_NAMEDSTREAMS;
+#else
+                       VOL_CAP_INT_EXTENDED_ATTR;
+#endif
+               cap->capabilities[VOL_CAPABILITIES_RESERVED1] = 0;
+               cap->capabilities[VOL_CAPABILITIES_RESERVED2] = 0;
+
+               cap->valid[VOL_CAPABILITIES_FORMAT] =
+                       VOL_CAP_FMT_PERSISTENTOBJECTIDS |
+                       VOL_CAP_FMT_SYMBOLICLINKS |
+                       VOL_CAP_FMT_HARDLINKS |
+                       VOL_CAP_FMT_JOURNAL |
+                       VOL_CAP_FMT_JOURNAL_ACTIVE |
+                       VOL_CAP_FMT_NO_ROOT_TIMES |
+                       VOL_CAP_FMT_SPARSE_FILES |
+                       VOL_CAP_FMT_ZERO_RUNS |
+                       VOL_CAP_FMT_CASE_SENSITIVE |
+                       VOL_CAP_FMT_CASE_PRESERVING |
+                       VOL_CAP_FMT_FAST_STATFS |
+                       VOL_CAP_FMT_2TB_FILESIZE |
+                       VOL_CAP_FMT_OPENDENYMODES |
+                       VOL_CAP_FMT_HIDDEN_FILES |
+                       VOL_CAP_FMT_PATH_FROM_ID;
+               cap->valid[VOL_CAPABILITIES_INTERFACES] =
+                       VOL_CAP_INT_SEARCHFS |
+                       VOL_CAP_INT_ATTRLIST |
+                       VOL_CAP_INT_NFSEXPORT |
+                       VOL_CAP_INT_READDIRATTR |
+                       VOL_CAP_INT_EXCHANGEDATA |
+                       VOL_CAP_INT_COPYFILE |
+                       VOL_CAP_INT_ALLOCATE |
+                       VOL_CAP_INT_VOL_RENAME |
+                       VOL_CAP_INT_ADVLOCK |
+                       VOL_CAP_INT_FLOCK |
+                       VOL_CAP_INT_MANLOCK |
+#if NAMEDSTREAMS
+                       VOL_CAP_INT_EXTENDED_ATTR |
+                       VOL_CAP_INT_NAMEDSTREAMS;
+#else
+                       VOL_CAP_INT_EXTENDED_ATTR;
+#endif
+               cap->valid[VOL_CAPABILITIES_RESERVED1] = 0;
+               cap->valid[VOL_CAPABILITIES_RESERVED2] = 0;
+               VFSATTR_SET_SUPPORTED(fsap, f_capabilities);
+       }
+       if (VFSATTR_IS_ACTIVE(fsap, f_attributes)) {
+               vol_attributes_attr_t *attrp = &fsap->f_attributes;
+
+               attrp->validattr.commonattr = HFS_ATTR_CMN_VALIDMASK;
+               attrp->validattr.volattr = ATTR_VOL_VALIDMASK & ~ATTR_VOL_INFO;
+               attrp->validattr.dirattr = ATTR_DIR_VALIDMASK;
+               attrp->validattr.fileattr = HFS_ATTR_FILE_VALIDMASK;
+               attrp->validattr.forkattr = 0;
+
+               attrp->nativeattr.commonattr = HFS_ATTR_CMN_VALIDMASK;
+               attrp->nativeattr.volattr = ATTR_VOL_VALIDMASK & ~ATTR_VOL_INFO;
+               attrp->nativeattr.dirattr = ATTR_DIR_VALIDMASK;
+               attrp->nativeattr.fileattr = HFS_ATTR_FILE_VALIDMASK;
+               attrp->nativeattr.forkattr = 0;
+               VFSATTR_SET_SUPPORTED(fsap, f_attributes);
+       }       
+       fsap->f_create_time.tv_sec = hfsmp->vcbCrDate;
+       fsap->f_create_time.tv_nsec = 0;
+       VFSATTR_SET_SUPPORTED(fsap, f_create_time);
+       fsap->f_modify_time.tv_sec = hfsmp->vcbLsMod;
+       fsap->f_modify_time.tv_nsec = 0;
+       VFSATTR_SET_SUPPORTED(fsap, f_modify_time);
+
+       fsap->f_backup_time.tv_sec = hfsmp->vcbVolBkUp;
+       fsap->f_backup_time.tv_nsec = 0;
+       VFSATTR_SET_SUPPORTED(fsap, f_backup_time);
+       if (VFSATTR_IS_ACTIVE(fsap, f_fssubtype)) {
+               u_int16_t subtype = 0;
+
+               /*
+                * Subtypes (flavors) for HFS
+                *   0:   Mac OS Extended
+                *   1:   Mac OS Extended (Journaled) 
+                *   2:   Mac OS Extended (Case Sensitive) 
+                *   3:   Mac OS Extended (Case Sensitive, Journaled) 
+                *   4 - 127:   Reserved
+                * 128:   Mac OS Standard
+                * 
+                */
+               if (hfsmp->hfs_flags & HFS_STANDARD) {
+                       subtype = HFS_SUBTYPE_STANDARDHFS;
+               } else /* HFS Plus */ {
+                       if (hfsmp->jnl)
+                               subtype |= HFS_SUBTYPE_JOURNALED;
+                       if (hfsmp->hfs_flags & HFS_CASE_SENSITIVE)
+                               subtype |= HFS_SUBTYPE_CASESENSITIVE;
+               }
+               fsap->f_fssubtype = subtype;
+               VFSATTR_SET_SUPPORTED(fsap, f_fssubtype);
+       }
+
+       if (VFSATTR_IS_ACTIVE(fsap, f_vol_name)) {
+               strlcpy(fsap->f_vol_name, (char *) hfsmp->vcbVN, MAXPATHLEN);
+               VFSATTR_SET_SUPPORTED(fsap, f_vol_name);
+       }
+       return (0);
+}
+
+/*
+ * Perform a volume rename.  Requires the FS' root vp.
+ */
+static int
+hfs_rename_volume(struct vnode *vp, const char *name, proc_t p)
+{
+       ExtendedVCB *vcb = VTOVCB(vp);
+       struct cnode *cp = VTOC(vp);
+       struct hfsmount *hfsmp = VTOHFS(vp);
+       struct cat_desc to_desc;
+       struct cat_desc todir_desc;
+       struct cat_desc new_desc;
+       cat_cookie_t cookie;
+       int lockflags;
+       int error = 0;
+
+       /*
+        * Ignore attempts to rename a volume to a zero-length name.
+        */
+       if (name[0] == 0)
+               return(0);
+
+       bzero(&to_desc, sizeof(to_desc));
+       bzero(&todir_desc, sizeof(todir_desc));
+       bzero(&new_desc, sizeof(new_desc));
+       bzero(&cookie, sizeof(cookie));
+
+       todir_desc.cd_parentcnid = kHFSRootParentID;
+       todir_desc.cd_cnid = kHFSRootFolderID;
+       todir_desc.cd_flags = CD_ISDIR;
+
+       to_desc.cd_nameptr = (const u_int8_t *)name;
+       to_desc.cd_namelen = strlen(name);
+       to_desc.cd_parentcnid = kHFSRootParentID;
+       to_desc.cd_cnid = cp->c_cnid;
+       to_desc.cd_flags = CD_ISDIR;
+
+       if ((error = hfs_lock(cp, HFS_EXCLUSIVE_LOCK)) == 0) {
+               if ((error = hfs_start_transaction(hfsmp)) == 0) {
+                       if ((error = cat_preflight(hfsmp, CAT_RENAME, &cookie, p)) == 0) {
+                               lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_EXCLUSIVE_LOCK);
+
+                               error = cat_rename(hfsmp, &cp->c_desc, &todir_desc, &to_desc, &new_desc);
+
+                               /*
+                                * If successful, update the name in the VCB, ensure it's terminated.
+                                */
+                               if (!error) {
+                                       strlcpy((char *)vcb->vcbVN, name, sizeof(vcb->vcbVN));
+                               }
+
+                               hfs_systemfile_unlock(hfsmp, lockflags);
+                               cat_postflight(hfsmp, &cookie, p);
+                       
+                               if (error)
+                                       MarkVCBDirty(vcb);
+                               (void) hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
+                       }
+                       hfs_end_transaction(hfsmp);
+               }                       
+               if (!error) {
+                       /* Release old allocated name buffer */
+                       if (cp->c_desc.cd_flags & CD_HASBUF) {
+                               const char *tmp_name = (const char *)cp->c_desc.cd_nameptr;
+               
+                               cp->c_desc.cd_nameptr = 0;
+                               cp->c_desc.cd_namelen = 0;
+                               cp->c_desc.cd_flags &= ~CD_HASBUF;
+                               vfs_removename(tmp_name);
+                       }                       
+                       /* Update cnode's catalog descriptor */
+                       replace_desc(cp, &new_desc);
+                       vcb->volumeNameEncodingHint = new_desc.cd_encoding;
+                       cp->c_touch_chgtime = TRUE;
+               }
+
+               hfs_unlock(cp);
+       }
+       
+       return(error);
+}
+
+/*
+ * Get file system attributes.
+ */
+static int
+hfs_vfs_setattr(struct mount *mp, struct vfs_attr *fsap, __unused vfs_context_t context)
+{
+       kauth_cred_t cred = vfs_context_ucred(context);
+       int error = 0;
+
+       /*
+        * Must be superuser or owner of filesystem to change volume attributes
+        */
+       if (!kauth_cred_issuser(cred) && (kauth_cred_getuid(cred) != vfs_statfs(mp)->f_owner))
+               return(EACCES);
+
+       if (VFSATTR_IS_ACTIVE(fsap, f_vol_name)) {
+               vnode_t root_vp;
+               
+               error = hfs_vfs_root(mp, &root_vp, context);
+               if (error)
+                       goto out;
+
+               error = hfs_rename_volume(root_vp, fsap->f_vol_name, vfs_context_proc(context));
+               (void) vnode_put(root_vp);
+               if (error)
+                       goto out;
+
+               VFSATTR_SET_SUPPORTED(fsap, f_vol_name);
+       }
+
+out:
+       return error;
+}
+
+/* If a runtime corruption is detected, set the volume inconsistent 
+ * bit in the volume attributes.  The volume inconsistent bit is a persistent
+ * bit which represents that the volume is corrupt and needs repair.  
+ * The volume inconsistent bit can be set from the kernel when it detects
+ * runtime corruption or from file system repair utilities like fsck_hfs when
+ * a repair operation fails.  The bit should be cleared only from file system 
+ * verify/repair utility like fsck_hfs when a verify/repair succeeds.
+ */
+void hfs_mark_volume_inconsistent(struct hfsmount *hfsmp)
+{
+       HFS_MOUNT_LOCK(hfsmp, TRUE);    
+       if ((hfsmp->vcbAtrb & kHFSVolumeInconsistentMask) == 0) {
+               hfsmp->vcbAtrb |= kHFSVolumeInconsistentMask;
+               MarkVCBDirty(hfsmp);
+       }
+       /* Log information to ASL log */
+       fslog_fs_corrupt(hfsmp->hfs_mp);
+       printf("HFS: Runtime corruption detected on %s, fsck will be forced on next mount.\n", hfsmp->vcbVN);
+       HFS_MOUNT_UNLOCK(hfsmp, TRUE);
+}
+
+/* Replay the journal on the device node provided.  Returns zero if 
+ * journal replay succeeded or no journal was supposed to be replayed.
+ */
+static int hfs_journal_replay(const char *devnode, vfs_context_t context)
+{
+       int retval = 0;
+       struct vnode *devvp = NULL;
+       struct mount *mp = NULL;
+       struct hfs_mount_args *args = NULL;
+
+       /* Lookup vnode for given raw device path */
+       retval = vnode_open(devnode, FREAD|FWRITE, 0, 0, &devvp, NULL);
+       if (retval) {
+               goto out;
+       }
+
+       /* Replay allowed only on raw devices */
+       if (!vnode_ischr(devvp)) {
+               retval = EINVAL;
+               goto out;
+       }
+
+       /* Create dummy mount structures */
+       MALLOC(mp, struct mount *, sizeof(struct mount), M_TEMP, M_WAITOK);
+       bzero(mp, sizeof(struct mount));
+       mount_lock_init(mp);
+
+       MALLOC(args, struct hfs_mount_args *, sizeof(struct hfs_mount_args), M_TEMP, M_WAITOK);
+       bzero(args, sizeof(struct hfs_mount_args));
+
+       retval = hfs_mountfs(devvp, mp, args, 1, context);
+       buf_flushdirtyblks(devvp, MNT_WAIT, 0, "hfs_journal_replay");
+
+out:
+       if (mp) {
+               mount_lock_destroy(mp);
+               FREE(mp, M_TEMP);
+       }
+       if (args) {
+               FREE(args, M_TEMP);
+       }
+       if (devvp) {
+               vnode_close(devvp, FREAD|FWRITE, NULL);
+       }
+       return retval;
+}
+
 /*
  * hfs vfs operations.
  */
@@ -2443,13 +4949,15 @@ struct vfsops hfs_vfsops = {
        hfs_mount,
        hfs_start,
        hfs_unmount,
-       hfs_root,
+       hfs_vfs_root,
        hfs_quotactl,
-       hfs_statfs,
+       hfs_vfs_getattr,        /* was hfs_statfs */
        hfs_sync,
-       hfs_vget,
+       hfs_vfs_vget,
        hfs_fhtovp,
        hfs_vptofh,
        hfs_init,
-       hfs_sysctl
+       hfs_sysctl,
+       hfs_vfs_setattr,
+       {NULL}
 };