]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/hfs/hfs_vfsops.c
xnu-792.6.61.tar.gz
[apple/xnu.git] / bsd / hfs / hfs_vfsops.c
index 395b4b1e1fb6deb69631a2e11490241b04946600..7ebe8aff727050771fff87363d7dc9037f378960 100644 (file)
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1999-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *      hfs_vfsops.c
  *  derived from       @(#)ufs_vfsops.c        8.8 (Berkeley) 5/20/95
  *
  *      hfs_vfsops.c
  *  derived from       @(#)ufs_vfsops.c        8.8 (Berkeley) 5/20/95
  *
- *      (c) Copyright 1997-1998 Apple Computer, Inc. All rights reserved.
+ *      (c) Copyright 1997-2002 Apple Computer, Inc. All rights reserved.
  *
  *      hfs_vfsops.c -- VFS layer for loadable HFS file system.
  *
  *
  *      hfs_vfsops.c -- VFS layer for loadable HFS file system.
  *
- *      HISTORY
- *      9-Nov-1999     Don Brady       Fix error handling in hfs_unmount [2399157].
- *      9-Sep-1999     Don Brady       Clear system file fcbModified flags in hfs_flushvolumeheader/hfs_flushMDB.
- *      5-Aug-1999     Pat Dirks       Moved special HFS flag from f_fsid.val[0][0] to mount flags (#2293117).
- *     23-Jul-1999     Pat Dirks       Added special-case code for root's parent directory in hfs_vget (#2263664).
- *      9-Jun-1999     Don Brady       Fix hfs_mount for reload and read-only downgrade cases.
- *      2-Jun-1999     Don Brady       Fix hfs_statfs to return correct f_files value.
- *      4-May-1999     Don Brady       Remove obsolete loadable module code.
- *     22-Mar-1999     Don Brady       Hide our private meta data in hfs_vget.
- *             18-May-1999     Don Brady       Add hfs_mountroot for HFS Plus rooting.
- *             22-Mar-1999     Don Brady       Hide our private meta data in hfs_vget.
- *              12-Nov-1998     Pat Dirks       Changed hfs_statfs to return volume's actual log. block size (#2286198).
- *             22-Aug-1998     Scott Roberts   Assign uid,gid, and mask for default on objects.
- *             29-Jul-1998     Pat Dirks               Fixed changed hfs_vget() to release complex node when retrying for data fork node.
- *             27-Jul-1998     Scott Roberts   Changes hfs_vget() to return data forks instead of complex.
- *         14-Jul-1998  CHW                    Added check for use count of device node in hfs_mountfs
- *         1-Jul-1998  Don Brady               Always set kHFSVolumeUnmountedMask bit of vcb->vcbAtrb in hfs_unmount.
- *        30-Jun-1998  Don Brady               Removed hard-coded EINVAL error in hfs_mountfs (for radar #2249539).
- *        24-Jun-1998  Don Brady               Added setting of timezone to hfs_mount (radar #2226387).
- *             4-Jun-1998      Don Brady               Use VPUT/VRELE macros instead of vput/vrele.
- *             6-May-1998      Scott Roberts   Updated hfs_vget with kernel changes.
- *             29-Apr-1998     Don Brady               Update hfs_statfs to actually fill in statfs fields (radar #2227092).
- *             23-Apr-1998     Pat Dirks               Cleaned up code to call brelse() on errors from bread().
- *              4/20/1998      Don Brady               Remove course-grained hfs metadata locking.
- *              4/18/1998      Don Brady               Add VCB locking.
- *              4/16/1998      Don Brady       hfs_unmount now flushes the volume bitmap. Add b-tree locking to hfs_vget.
- *               4/8/1998      Don Brady       Replace hfs_mdbupdate with hfs_flushvolumeheader and hfs_flushMDB.
- *               4/8/1998      Don Brady       In hfs_unmount call hfs_mdbupdate before trashing metafiles!
- *               4/3/1998      Don Brady       Call InitCatalogCache instead of PostInitFS.
- *               4/1/1998      Don Brady       Get rid of gHFSFlags, gReqstVol and gFlushOnlyFlag globals (not used).
- *              3/30/1998      Don Brady       In hfs_unmount use SKIPSYSTEM option on first vflush.
- *              3/26/1998      Don Brady       Changed hfs_unmount to call vflush before calling hfsUnmount.
- *                                                             In hfs_mountfs don't mount hfs-wrapper.
- *              3/19/1998      Pat Dirks       Fixed bug in hfs_mount where device vnode was being
- *                                                             released on way out.
- *      11/14/1997     Pat Dirks       Derived from hfs_vfsops.c
  */
 #include <sys/param.h>
 #include <sys/systm.h>
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kauth.h>
 
 #include <sys/ubc.h>
 
 #include <sys/ubc.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
-#include <sys/mount.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/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 <kern/locks.h>
+
+#include <vfs/vfs_journal.h>
+
 #include <miscfs/specfs/specdev.h>
 #include <hfs/hfs_mount.h>
 
 #include "hfs.h"
 #include <miscfs/specfs/specdev.h>
 #include <hfs/hfs_mount.h>
 
 #include "hfs.h"
+#include "hfs_catalog.h"
+#include "hfs_cnode.h"
 #include "hfs_dbg.h"
 #include "hfs_endian.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"
 
 
 #include "hfscommon/headers/FileMgrInternal.h"
 #include "hfscommon/headers/BTreesInternal.h"
 
+
 #if    HFS_DIAGNOSTIC
 int hfs_dbg_all = 0;
 #if    HFS_DIAGNOSTIC
 int hfs_dbg_all = 0;
-int hfs_dbg_vfs = 0;
-int hfs_dbg_vop = 0;
-int hfs_dbg_load = 0;
-int hfs_dbg_io = 0;
-int hfs_dbg_utils = 0;
-int hfs_dbg_rw = 0;
-int hfs_dbg_lookup = 0;
-int hfs_dbg_tree = 0;
 int hfs_dbg_err = 0;
 int hfs_dbg_err = 0;
-int hfs_dbg_test = 0;
 #endif
 
 
 #endif
 
 
-/*
- * These come from IOKit/storage/IOMediaBSDClient.h
- */
-#define DKIOCGETBLOCKSIZE            _IOR('d', 24, u_int32_t)
-#define DKIOCSETBLOCKSIZE            _IOW('d', 24, u_int32_t)
-#define DKIOCGETBLOCKCOUNT           _IOR('d', 25, u_int64_t)
-
-/*
- * HFS File System globals:
- */
-Ptr                                    gBufferAddress[BUFFERPTRLISTSIZE];
-struct buf                     *gBufferHeaderPtr[BUFFERPTRLISTSIZE];
-int                                    gBufferListIndex;
-simple_lock_data_t     gBufferPtrListLock;
-
-//static char hfs_fs_name[MFSNAMELEN] = "hfs";
+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;
 
 
 
 
-/*
- * Global variables defined in other modules:
- */
 extern struct vnodeopv_desc hfs_vnodeop_opv_desc;
 
 extern struct vnodeopv_desc hfs_vnodeop_opv_desc;
 
-extern struct vnode *hfs_vhashget(dev_t dev, UInt32 nodeID, UInt8 forkType);
+extern void hfs_converterinit(void);
 
 
-extern OSErr HFSPlusToHFSExtents( const HFSPlusExtentRecord    oldExtents, HFSExtentRecord newExtents);
+extern void inittodr(time_t base);
 
 
+extern int  hfs_write_access(struct vnode *, kauth_cred_t, struct proc *, Boolean);
 
 
-extern void inittodr( time_t base);
-extern OSErr GetVolumeNameFromCatalog(ExtendedVCB *vcb);
-extern void CopyCatalogToObjectMeta(struct hfsCatalogInfo *catInfo, struct vnode *vp, struct hfsfilemeta *fm);
-extern void CopyCatalogToFCB(struct hfsCatalogInfo *catInfo, struct vnode *vp);
-extern void hfs_name_CatToMeta(CatalogNodeData *nodeData, struct hfsfilemeta *fm);
 
 
-int hfs_changefs(struct mount *mp, struct hfs_mount_args *args, struct proc *p);
+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, vfs_context_t context);
+static int hfs_reload(struct mount *mp, kauth_cred_t cred, struct proc *p);
+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_vfs_vget(struct mount *mp, ino64_t ino, struct vnode **vpp, vfs_context_t context);
+static int hfs_vptofh(struct vnode *vp, int *fhlenp, unsigned char *fhp, vfs_context_t context);
 
 
-int hfs_reload(struct mount *mp, struct ucred *cred, struct proc *p);
-int hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mount_args *args);
-int hfs_vget(struct mount *mp, void *objID, struct vnode **vpp);
-void hfs_vhashinit();
-void hfs_converterinit(void);
-
-
-static int hfs_statfs();
+static int hfs_reclaimspace(struct hfsmount *hfsmp, u_long startblk);
 
 
 /*
  * Called by vfs_mountroot when mounting HFS Plus as root.
  */
 
 
 /*
  * Called by vfs_mountroot when mounting HFS Plus as root.
  */
+
+__private_extern__
 int
 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;
        struct hfsmount *hfsmp;
+       ExtendedVCB *vcb;
+       struct vfsstatfs *vfsp;
        int error;
        
        int error;
        
-       /*
-        * Get vnode for rootdev.
-        */
-       if ((error = bdevvp(rootdev, &rootvp))) {
-               printf("hfs_mountroot: can't setup bdevvp");
-               return (error);
-       }
-       if ((error = vfs_rootmountalloc("hfs", "root_device", &mp)))
+       if ((error = hfs_mountfs(rvp, mp, NULL, context)))
                return (error);
                return (error);
-       if ((error = hfs_mountfs(rootvp, mp, p, NULL))) {
-               mp->mnt_vfc->vfc_refcount--;
-               vfs_unbusy(mp, p);
-               _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);
 
        /* Init hfsmp */
        hfsmp = VFSTOHFS(mp);
 
@@ -220,10 +167,14 @@ hfs_mountroot()
        hfsmp->hfs_dir_mask = (S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH); /* 0755 */
        hfsmp->hfs_file_mask = (S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH); /* 0755 */
 
        hfsmp->hfs_dir_mask = (S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH); /* 0755 */
        hfsmp->hfs_file_mask = (S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH); /* 0755 */
 
-       (void)hfs_statfs(mp, &mp->mnt_stat, p);
-       
-       vfs_unbusy(mp, p);
-       inittodr(to_bsd_time(HFSTOVCB(hfsmp)->vcbLsMod));
+       /* Establish the free block reserve. */
+       vcb = HFSTOVCB(hfsmp);
+       vcb->reserveBlocks = ((u_int64_t)vcb->totalBlocks * HFS_MINFREE) / 100;
+       vcb->reserveBlocks = MIN(vcb->reserveBlocks, HFS_MAXRESERVE / vcb->blockSize);
+
+       vfsp = vfs_statfs(mp);
+       (void)hfs_statfs(mp, vfsp, NULL);
+
        return (0);
 }
 
        return (0);
 }
 
@@ -234,228 +185,261 @@ hfs_mountroot()
  * mount system call
  */
 
  * mount system call
  */
 
-int
-hfs_mount (mp, path, data, ndp, p)
-       register struct mount *mp;
-       char *path;
-       caddr_t data;
-       struct nameidata *ndp;
-       struct proc *p;
+static int
+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 hfsmount *hfsmp = NULL;
-       struct vnode *devvp;
        struct hfs_mount_args args;
        struct hfs_mount_args args;
-       size_t size;
        int retval = E_NONE;
        int retval = E_NONE;
-       int flags;
-       mode_t accessmode;
-       int loadconv = 0;
-
-       if ((retval = copyin(data, (caddr_t)&args, sizeof(args))))
-               goto error_exit;
+       uint32_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 = (uint32_t)vfs_flags(mp) & MNT_CMDFLAGS;
+       if (cmdflags & MNT_UPDATE) {
                hfsmp = VFSTOHFS(mp);
                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, vfs_context_ucred(context), p);
+                       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 */
                        /* 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;
                
                        flags = WRITECLOSE;
-                       if (mp->mnt_flag & MNT_FORCE)
+                       if (cmdflags & MNT_FORCE)
                                flags |= FORCECLOSE;
                                
                                flags |= FORCECLOSE;
                                
-                       if ((retval = hfs_flushfiles(mp, flags)))
-                               goto error_exit;
-                       hfsmp->hfs_fs_clean = 1;
-                       hfsmp->hfs_fs_ronly = 1;
-                       if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)
-                               retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT);
-                       else
-                               retval = hfs_flushMDB(hfsmp, MNT_WAIT);
+                       if ((retval = hfs_flushfiles(mp, flags, p)))
+                               goto out;
+                       hfsmp->hfs_flags |= HFS_READ_ONLY;
+                       retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
 
                        /* also get the volume bitmap blocks */
 
                        /* 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) {
                        if (retval) {
-                               hfsmp->hfs_fs_clean = 0;
-                               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);
 
 
-               if ((mp->mnt_flag & MNT_RELOAD) &&
-                       (retval = hfs_reload(mp, ndp->ni_cnd.cn_cred, p)))
-                       goto error_exit;
+                           journal_close(hfsmp->jnl);
+                           hfsmp->jnl = NULL;
 
 
-               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.
-                        */
-                       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);
+                           // 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 (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)
-                               retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT);
-                       else
-                               retval = hfs_flushMDB(hfsmp, MNT_WAIT);
-       
+               }
+
+               /* Change to a writable file system. */
+               if (vfs_iswriteupgrade(mp)) {
+                       retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
                        if (retval != E_NONE)
                        if (retval != E_NONE)
-                               goto error_exit;
+                               goto out;
 
 
-                       /* only change hfs_fs_ronly after a successfull write */
-                       hfsmp->hfs_fs_ronly = 0;
-                       hfsmp->hfs_fs_clean = 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;
+                           }
 
 
-               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 (args.fspec == 0) {
-                       /*
-                        * Process export requests.
-                        */
-                       return vfs_export(mp, &hfsmp->hfs_export, &args.export);
+                       /* 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 directory for unlinked files */
+                               FindMetaDataDirectory(HFSTOVCB(hfsmp));
+                               hfs_remove_orphans(hfsmp);
+
+                               /*
+                                * Allow hot file clustering if conditions allow.
+                                */
+                               if (hfsmp->hfs_flags & HFS_METADATA_ZONE) {
+                                       (void) hfs_recording_init(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, (uint64_t)((unsigned int)MNT_DOVOLFS));
+
+               retval = hfs_mountfs(devvp, mp, &args, 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);
+}
+
+
+struct hfs_changefs_cargs {
+       struct hfsmount *hfsmp;
+        int            namefix;
+        int            permfix;
+        int            permswitch;
+};
+
+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;
+
+       args = (struct hfs_changefs_cargs *)cargs;
+
+       cp = VTOC(vp);
+       vcb = HFSTOVCB(args->hfsmp);
 
 
+       if (cat_lookup(args->hfsmp, &cp->c_desc, 0, &cndesc, &cnattr, NULL, NULL)) {
+               /*
+                * If we couldn't find this guy skip to the next one
+                */
+               if (args->namefix)
+                       cache_purge(vp);
+
+               return (VNODE_RETURNED);
+       }
        /*
        /*
-        * If mount by non-root, then verify that user has necessary
-        * permissions on the device.
+        * Get the real uid/gid and perm mask from disk.
         */
         */
-       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 (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 ((mp->mnt_flag & MNT_UPDATE) == 0) {
-               retval = hfs_mountfs(devvp, mp, p, &args);
-               if (retval != E_NONE)
-                       vrele(devvp);
+               if (cndesc.cd_cnid == kHFSRootFolderID) {
+                       strncpy(vcb->vcbVN, cp->c_desc.cd_nameptr, NAME_MAX);
+                       cp->c_desc.cd_encoding = args->hfsmp->hfs_encoding;
+               }
        } else {
        } else {
-               if (devvp != hfsmp->hfs_devvp)
-                       retval = EINVAL;        /* needs translation */
-               else
-                       retval = hfs_changefs(mp, &args, p);
-               vrele(devvp);
-       }
-
-       if (retval != E_NONE) {
-               goto error_exit;
+               cat_releasedesc(&cndesc);
        }
        }
-
-       
-       /* 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);
-       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);
-
-error_exit:
-
-       return (retval);
+       return (VNODE_RETURNED);
 }
 
 }
 
-
-/* change fs mount parameters */
-int
-hfs_changefs(mp, args, p)
-       struct mount *mp;
-       struct hfs_mount_args *args;
-       struct proc *p;
+/* Change fs mount parameters */
+static int
+hfs_changefs(struct mount *mp, struct hfs_mount_args *args)
 {
 {
-       int retval;
+       int retval = 0;
        int namefix, permfix, permswitch;
        struct hfsmount *hfsmp;
        int namefix, permfix, permswitch;
        struct hfsmount *hfsmp;
-       struct hfsnode *hp;
-       mode_t hfs_file_mask;
        ExtendedVCB *vcb;
        ExtendedVCB *vcb;
-       hfsCatalogInfo catInfo;
-       register struct vnode *vp, *nvp;
        hfs_to_unicode_func_t   get_unicode_func;
        unicode_to_hfs_func_t   get_hfsname_func;
        hfs_to_unicode_func_t   get_unicode_func;
        unicode_to_hfs_func_t   get_hfsname_func;
+       u_long old_encoding = 0;
+       struct hfs_changefs_cargs cargs;
+       uint32_t mount_flags;
 
        hfsmp = VFSTOHFS(mp);
        vcb = HFSTOVCB(hfsmp);
 
        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: */
        /* 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, (uint64_t)((unsigned int)MNT_UNKNOWNPERMISSIONS));   /* Just say "No". */
                return EINVAL;
                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;
 
 
-       /* change the timezone (Note: this affects all hfs volumes and hfs+ volume create dates) */
+       /* 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;
        }
 
        if (args->hfs_timezone.tz_minuteswest != VNOVAL) {
                gTimeZone = args->hfs_timezone;
        }
 
-       /* change the default uid, gid and/or mask */
+       /* 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 ((args->hfs_uid != (uid_t)VNOVAL) && (hfsmp->hfs_uid != args->hfs_uid)) {
                hfsmp->hfs_uid = args->hfs_uid;
-               ++permfix;
+               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 ((args->hfs_gid != (gid_t)VNOVAL) && (hfsmp->hfs_gid != args->hfs_gid)) {
                hfsmp->hfs_gid = args->hfs_gid;
-               ++permfix;
+               if (vcb->vcbSigWord == kHFSPlusSigWord)
+                       ++permfix;
        }
        if (args->hfs_mask != (mode_t)VNOVAL) {
                if (hfsmp->hfs_dir_mask != (args->hfs_mask & ALLPERMS)) {
        }
        if (args->hfs_mask != (mode_t)VNOVAL) {
                if (hfsmp->hfs_dir_mask != (args->hfs_mask & ALLPERMS)) {
@@ -463,17 +447,19 @@ 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);
                        hfsmp->hfs_file_mask = args->hfs_mask & ALLPERMS;
                        if ((args->flags != VNOVAL) && (args->flags & HFSFSMNT_NOXONFILES))
                                hfsmp->hfs_file_mask = (args->hfs_mask & DEFFILEMODE);
-                       ++permfix;
+                       if (vcb->vcbSigWord == kHFSPlusSigWord)
+                               ++permfix;
                }
        }
        
                }
        }
        
-       /* change the hfs encoding value (hfs only) */
-       if ((HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord)        &&
-           (hfsmp->hfs_encoding != (u_long)VNOVAL)             &&
+       /* Change the hfs encoding value (hfs only) */
+       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);
            (hfsmp->hfs_encoding != args->hfs_encoding)) {
 
                retval = hfs_getconverter(args->hfs_encoding, &get_unicode_func, &get_hfsname_func);
-               if (retval) goto error_exit;
+               if (retval)
+                       goto exit;
 
                /*
                 * Connect the new hfs_get_unicode converter but leave
 
                /*
                 * Connect the new hfs_get_unicode converter but leave
@@ -486,143 +472,97 @@ hfs_changefs(mp, args, p)
                 * in the old converters.
                 */
                hfsmp->hfs_get_unicode = get_unicode_func;
                 * in the old converters.
                 */
                hfsmp->hfs_get_unicode = get_unicode_func;
+               old_encoding = hfsmp->hfs_encoding;
+               hfsmp->hfs_encoding = args->hfs_encoding;
                ++namefix;
        }
 
                ++namefix;
        }
 
+       if (!(namefix || permfix || permswitch))
+               goto exit;
 
 
-       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.
        /*
         * 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;
-               }
-       
-               hp = VTOH(vp);
-
-               INIT_CATALOGDATA(&catInfo.nodeData, 0);
-               
-               catInfo.hint = kNoHint;
-               retval = hfs_getcatalog(vcb, H_DIRID(hp), H_NAME(hp), hp->h_meta->h_namelen, &catInfo);
-               /* 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;
-               }
-
-               H_HINT(hp) = catInfo.hint;
-               if (permswitch || (permfix && (hp->h_meta->h_metaflags & IN_UNSETACCESS))) {
-                       if ((vcb->vcbSigWord == kHFSPlusSigWord) && (catInfo.nodeData.cnd_mode & IFMT)) {
-                               if (mp->mnt_flag & MNT_UNKNOWNPERMISSIONS) {
-                                       /*
-                                        *      Override the permissions as determined by the mount auguments
-                                        *  in ALMOST the same way unset permissions are treated but keep
-                                        *      track of whether or not the file or folder is hfs locked
-                                        *  by leaving the h_pflags field unchanged from what was unpacked
-                                        *  out of the catalog.
-                                        */ 
-                                       hp->h_meta->h_metaflags |= IN_UNSETACCESS;                      
-                                       hp->h_meta->h_uid = VTOHFS(vp)->hfs_uid;
-                                       hp->h_meta->h_gid = VTOHFS(vp)->hfs_gid;
-                               } else {
-                                       hp->h_meta->h_uid = catInfo.nodeData.cnd_ownerID;
-                                       hp->h_meta->h_gid = catInfo.nodeData.cnd_groupID;
-                               };
-                               hp->h_meta->h_mode = (mode_t)catInfo.nodeData.cnd_mode;
-                       } else {
-                               /*
-                                *      Set the permissions as determined by the mount auguments
-                                *      but keep in account if the file or folder is hfs locked
-                                */ 
-                               hp->h_meta->h_metaflags |= IN_UNSETACCESS;                      
-                               hp->h_meta->h_uid = VTOHFS(vp)->hfs_uid;
-                               hp->h_meta->h_gid = VTOHFS(vp)->hfs_gid;
-                                
-                               /* Default access is full read/write/execute: */
-                               hp->h_meta->h_mode &= IFMT;
-                               hp->h_meta->h_mode |= ACCESSPERMS;      /* 0777: rwxrwxrwx */
-                               /* ... but no more than that permitted by the mount point's: */
-                               if ((hp->h_meta->h_mode & IFMT) == IFDIR) {
-                                       hp->h_meta->h_mode &= IFMT | VTOHFS(vp)->hfs_dir_mask;
-                               } else {
-                                       hp->h_meta->h_mode &= IFMT | VTOHFS(vp)->hfs_file_mask;
-                               }
-                       };
-               };
-               
-               /*
-                * 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);
-                       hfs_name_CatToMeta(&catInfo.nodeData, hp->h_meta);
-
-                       if (catInfo.nodeData.cnd_nodeID == kHFSRootFolderID)
-                               strncpy(vcb->vcbVN, H_NAME(hp), NAME_MAX);
-               }
-
-               CLEAN_CATALOGDATA(&catInfo.nodeData);
+       cargs.hfsmp = hfsmp;
+       cargs.namefix = namefix;
+       cargs.permfix = permfix;
+       cargs.permswitch = permswitch;
 
 
-               vput(vp);
-               simple_lock(&mntvnode_slock);
+       vnode_iterate(mp, 0, hfs_changefs_callback, (void *)&cargs);
 
 
-               } /* end for (vp...) */
-               simple_unlock(&mntvnode_slock);
-
-
-exit:  
        /*
         * If we're switching name converters we can now
         * connect the new hfs_get_hfsname converter and
         * release our interest in the old converters.
         */
        if (namefix) {
        /*
         * If we're switching name converters we can now
         * connect the new hfs_get_hfsname converter and
         * release our interest in the old converters.
         */
        if (namefix) {
-               u_long old_encoding = hfsmp->hfs_encoding;
-
                hfsmp->hfs_get_hfsname = get_hfsname_func;
                hfsmp->hfs_get_hfsname = get_hfsname_func;
-               hfsmp->hfs_encoding = args->hfs_encoding;
                vcb->volumeNameEncodingHint = args->hfs_encoding;
                vcb->volumeNameEncodingHint = args->hfs_encoding;
-
                (void) hfs_relconverter(old_encoding);
        }
                (void) hfs_relconverter(old_encoding);
        }
+exit:
+       return (retval);
+}
 
 
-       return (0);
 
 
-error_exit:
+struct hfs_reload_cargs {
+       struct hfsmount *hfsmp;
+        kauth_cred_t cred;
+        struct proc    *p;
+        int            error;
+};
 
 
-       return (retval);
-}
+static int
+hfs_reload_callback(struct vnode *vp, void *cargs)
+{
+       struct cnode *cp;
+       struct hfs_reload_cargs *args;
+
+       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_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 ((args->error = cat_idlookup(args->hfsmp, cp->c_fileid, &desc, &cp->c_attr, datafork)))
+                       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
 
 /*
  * Reload all incore data for a filesystem (used after running fsck on
@@ -630,32 +570,28 @@ error_exit:
  * be mounted read-only.
  *
  * Things to do to update the mount:
  * be mounted read-only.
  *
  * Things to do to update the mount:
- *     1) invalidate all cached meta-data.
- *     2) re-read volume header from disk.
- *     3) re-load meta-file info (extents, file size).
- *     4) re-load B-tree header data.
- *     5) invalidate all inactive vnodes.
- *     6) invalidate all cached file data.
- *     7) re-read hfsnode data for all active vnodes.
+ *     invalidate all cached meta-data.
+ *     invalidate all inactive vnodes.
+ *     invalidate all cached file data.
+ *     re-read volume header from disk.
+ *     re-load meta-file info (extents, file size).
+ *     re-load B-tree header data.
+ *     re-read cnode data for all active vnodes.
  */
  */
-int
-hfs_reload(mountp, cred, p)
-       register struct mount *mountp;
-       struct ucred *cred;
-       struct proc *p;
+static int
+hfs_reload(struct mount *mountp, kauth_cred_t cred, struct proc *p)
 {
 {
-       register struct vnode *vp, *nvp, *devvp;
-       struct hfsnode *hp;
+       register struct vnode *devvp;
        struct buf *bp;
        int sectorsize;
        int error, i;
        struct hfsmount *hfsmp;
        struct HFSPlusVolumeHeader *vhp;
        ExtendedVCB *vcb;
        struct buf *bp;
        int sectorsize;
        int error, i;
        struct hfsmount *hfsmp;
        struct HFSPlusVolumeHeader *vhp;
        ExtendedVCB *vcb;
-       FCB *fcb;
-
-       if ((mountp->mnt_flag & MNT_RDONLY) == 0)
-               return (EINVAL);
+       struct filefork *forkp;
+       struct cat_desc cndesc;
+       struct hfs_reload_cargs args;
+       int lockflags;
 
        hfsmp = VFSTOHFS(mountp);
        vcb = HFSTOVCB(hfsmp);
 
        hfsmp = VFSTOHFS(mountp);
        vcb = HFSTOVCB(hfsmp);
@@ -667,43 +603,65 @@ hfs_reload(mountp, cred, p)
         * Invalidate all cached meta-data.
         */
        devvp = hfsmp->hfs_devvp;
         * 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");
                panic("hfs_reload: dirty1");
-       InvalidateCatalogCache(vcb);
+
+       args.hfsmp = hfsmp;
+       args.cred = cred;
+       args.p = p;
+       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
+        */
+       lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_EXCLUSIVE_LOCK);
+       vnode_iterate(mountp, VNODE_RELOAD | VNODE_WAIT, hfs_reload_callback, (void *)&args);
+       hfs_systemfile_unlock(hfsmp, lockflags);
+
+       if (args.error)
+               return (args.error);
 
        /*
         * Re-read VolumeHeader from disk.
         */
        sectorsize = hfsmp->hfs_phys_block_size;
 
 
        /*
         * 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)
                        sectorsize, NOCRED, &bp);
        if (error) {
                if (bp != NULL)
-                       brelse(bp);
+                       buf_brelse(bp);
                return (error);
        }
 
                return (error);
        }
 
-       vhp = (HFSPlusVolumeHeader *) (bp->b_data + HFS_PRI_OFFSET(sectorsize));
+       vhp = (HFSPlusVolumeHeader *) (buf_dataptr(bp) + HFS_PRI_OFFSET(sectorsize));
 
 
-       if ((ValidVolumeHeader(vhp) != 0) || (vcb->blockSize != SWAP_BE32 (vhp->blockSize))) {
-               brelse(bp);
-               return (EIO);           /* XXX needs translation */
+       /* Do a quick sanity check */
+       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) {
+               buf_brelse(bp);
+               return (EIO);
        }
 
        }
 
-       vcb->vcbLsMod                   = SWAP_BE32 (vhp->modifyDate);
-       vcb->vcbAtrb                    = (UInt16) SWAP_BE32 (vhp->attributes); /* VCB only uses lower 16 bits */
-       vcb->vcbClpSiz                  = SWAP_BE32 (vhp->rsrcClumpSize);
-       vcb->vcbNxtCNID                 = SWAP_BE32 (vhp->nextCatalogID);
-       vcb->vcbVolBkUp                 = SWAP_BE32 (vhp->backupDate);
-       vcb->vcbWrCnt                   = SWAP_BE32 (vhp->writeCount);
-       vcb->vcbFilCnt                  = SWAP_BE32 (vhp->fileCount);
-       vcb->vcbDirCnt                  = SWAP_BE32 (vhp->folderCount);
+       vcb->vcbLsMod           = to_bsd_time(SWAP_BE32(vhp->modifyDate));
+       vcb->vcbAtrb            = SWAP_BE32 (vhp->attributes);
+       vcb->vcbJinfoBlock  = SWAP_BE32(vhp->journalInfoBlock);
+       vcb->vcbClpSiz          = SWAP_BE32 (vhp->rsrcClumpSize);
+       vcb->vcbNxtCNID         = SWAP_BE32 (vhp->nextCatalogID);
+       vcb->vcbVolBkUp         = to_bsd_time(SWAP_BE32(vhp->backupDate));
+       vcb->vcbWrCnt           = SWAP_BE32 (vhp->writeCount);
+       vcb->vcbFilCnt          = SWAP_BE32 (vhp->fileCount);
+       vcb->vcbDirCnt          = SWAP_BE32 (vhp->folderCount);
        vcb->nextAllocation     = SWAP_BE32 (vhp->nextAllocation);
        vcb->nextAllocation     = SWAP_BE32 (vhp->nextAllocation);
-       vcb->totalBlocks                = SWAP_BE32 (vhp->totalBlocks);
-       vcb->freeBlocks                 = SWAP_BE32 (vhp->freeBlocks);
-       vcb->checkedDate                = SWAP_BE32 (vhp->checkedDate);
+       vcb->totalBlocks        = SWAP_BE32 (vhp->totalBlocks);
+       vcb->freeBlocks         = SWAP_BE32 (vhp->freeBlocks);
        vcb->encodingsBitmap    = SWAP_BE64 (vhp->encodingsBitmap);
        bcopy(vhp->finderInfo, vcb->vcbFndrInfo, sizeof(vhp->finderInfo));    
        vcb->localCreateDate    = SWAP_BE32 (vhp->createDate); /* hfs+ create date is in local time */ 
        vcb->encodingsBitmap    = SWAP_BE64 (vhp->encodingsBitmap);
        bcopy(vhp->finderInfo, vcb->vcbFndrInfo, sizeof(vhp->finderInfo));    
        vcb->localCreateDate    = SWAP_BE32 (vhp->createDate); /* hfs+ create date is in local time */ 
@@ -711,117 +669,86 @@ hfs_reload(mountp, cred, p)
        /*
         * Re-load meta-file vnode data (extent info, file size, etc).
         */
        /*
         * Re-load meta-file vnode data (extent info, file size, etc).
         */
-       fcb = VTOFCB((struct vnode *)vcb->extentsRefNum);
-       /* bcopy(vhp->extentsFile.extents, fcb->fcbExtents, sizeof(HFSPlusExtentRecord)); */
-    for (i = 0; i < kHFSPlusExtentDensity; i++) {
-        fcb->fcbExtents[i].startBlock  = SWAP_BE32 (vhp->extentsFile.extents[i].startBlock);
-        fcb->fcbExtents[i].blockCount  = SWAP_BE32 (vhp->extentsFile.extents[i].blockCount);
-    }
-       fcb->fcbEOF                     = SWAP_BE64 (vhp->extentsFile.logicalSize);
-       fcb->fcbPLen            = SWAP_BE32 (vhp->extentsFile.totalBlocks) * vcb->blockSize;
-       fcb->fcbClmpSize        = SWAP_BE32 (vhp->extentsFile.clumpSize);
-
-       fcb = VTOFCB((struct vnode *)vcb->catalogRefNum);
-       /* bcopy(vhp->catalogFile.extents, fcb->fcbExtents, sizeof(HFSPlusExtentRecord)); */
-    for (i = 0; i < kHFSPlusExtentDensity; i++) {
-        fcb->fcbExtents[i].startBlock  = SWAP_BE32 (vhp->catalogFile.extents[i].startBlock);
-        fcb->fcbExtents[i].blockCount  = SWAP_BE32 (vhp->catalogFile.extents[i].blockCount);
-    }
-       fcb->fcbPLen            = SWAP_BE64 (vhp->catalogFile.logicalSize);
-       fcb->fcbPLen            = SWAP_BE32 (vhp->catalogFile.totalBlocks) * vcb->blockSize;
-       fcb->fcbClmpSize        = SWAP_BE32 (vhp->catalogFile.clumpSize);
-
-       fcb = VTOFCB((struct vnode *)vcb->allocationsRefNum);
-       /* bcopy(vhp->allocationFile.extents, fcb->fcbExtents, sizeof(HFSPlusExtentRecord)); */
-    for (i = 0; i < kHFSPlusExtentDensity; i++) {
-        fcb->fcbExtents[i].startBlock  = SWAP_BE32 (vhp->allocationFile.extents[i].startBlock);
-        fcb->fcbExtents[i].blockCount  = SWAP_BE32 (vhp->allocationFile.extents[i].blockCount);
-    }
-       fcb->fcbEOF                     = SWAP_BE64 (vhp->allocationFile.logicalSize);
-       fcb->fcbPLen            = SWAP_BE32 (vhp->allocationFile.totalBlocks) * vcb->blockSize;
-       fcb->fcbClmpSize        = SWAP_BE32 (vhp->allocationFile.clumpSize);
-
-       brelse(bp);
+       forkp = VTOF((struct vnode *)vcb->extentsRefNum);
+       for (i = 0; i < kHFSPlusExtentDensity; i++) {
+               forkp->ff_extents[i].startBlock =
+                       SWAP_BE32 (vhp->extentsFile.extents[i].startBlock);
+               forkp->ff_extents[i].blockCount =
+                       SWAP_BE32 (vhp->extentsFile.extents[i].blockCount);
+       }
+       forkp->ff_size      = SWAP_BE64 (vhp->extentsFile.logicalSize);
+       forkp->ff_blocks    = SWAP_BE32 (vhp->extentsFile.totalBlocks);
+       forkp->ff_clumpsize = SWAP_BE32 (vhp->extentsFile.clumpSize);
+
+
+       forkp = VTOF((struct vnode *)vcb->catalogRefNum);
+       for (i = 0; i < kHFSPlusExtentDensity; i++) {
+               forkp->ff_extents[i].startBlock =
+                       SWAP_BE32 (vhp->catalogFile.extents[i].startBlock);
+               forkp->ff_extents[i].blockCount =
+                       SWAP_BE32 (vhp->catalogFile.extents[i].blockCount);
+       }
+       forkp->ff_size      = SWAP_BE64 (vhp->catalogFile.logicalSize);
+       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++) {
+               forkp->ff_extents[i].startBlock =
+                       SWAP_BE32 (vhp->allocationFile.extents[i].startBlock);
+               forkp->ff_extents[i].blockCount =
+                       SWAP_BE32 (vhp->allocationFile.extents[i].blockCount);
+       }
+       forkp->ff_size      = SWAP_BE64 (vhp->allocationFile.logicalSize);
+       forkp->ff_blocks    = SWAP_BE32 (vhp->allocationFile.totalBlocks);
+       forkp->ff_clumpsize = SWAP_BE32 (vhp->allocationFile.clumpSize);
+
+       buf_brelse(bp);
        vhp = NULL;
 
        /*
         * Re-load B-tree header data
         */
        vhp = NULL;
 
        /*
         * Re-load B-tree header data
         */
-       fcb = VTOFCB((struct vnode *)vcb->extentsRefNum);
-       if (error = MacToVFSError( BTReloadData(fcb) ))
+       forkp = VTOF((struct vnode *)vcb->extentsRefNum);
+       if ( (error = MacToVFSError( BTReloadData((FCB*)forkp) )) )
                return (error);
 
                return (error);
 
-       fcb = VTOFCB((struct vnode *)vcb->catalogRefNum);
-       if (error = MacToVFSError( BTReloadData(fcb) ))
+       forkp = VTOF((struct vnode *)vcb->catalogRefNum);
+       if ( (error = MacToVFSError( BTReloadData((FCB*)forkp) )) )
                return (error);
 
                return (error);
 
-       /* Now that the catalog is ready, get the volume name */
-       /* also picks up the create date in GMT */
-       if ((error = MacToVFSError( GetVolumeNameFromCatalog(vcb) )))
+       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)))
                return (error);
                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 */
 
        /* Re-establish private/hidden directory for unlinked files */
-       hfsmp->hfs_private_metadata_dir = FindMetaDataDirectory(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 hfsnode data for all active vnodes (non-metadata files).
-                */
-               hp = VTOH(vp);
-               if ((vp->v_flag & VSYSTEM) == 0) {
-                       hfsCatalogInfo catInfo;
-
-                       /* lookup by fileID since name could have changed */
-                       catInfo.hint = kNoHint;
-                       INIT_CATALOGDATA(&catInfo.nodeData, 0);
-
-                       if ((error = hfs_getcatalog(vcb, H_FILEID(hp), NULL, -1, &catInfo))) {
-                               vput(vp);
-                               CLEAN_CATALOGDATA(&catInfo.nodeData);
-                               return (error);
-                       }
-
-                       H_HINT(hp) = catInfo.hint;
-            if (hp->h_meta->h_metaflags & IN_LONGNAME)
-                               FREE(H_NAME(hp), M_TEMP);
-                       H_NAME(hp) = NULL;
-            hp->h_meta->h_namelen = 0;
-                       CopyCatalogToObjectMeta(&catInfo, vp, hp->h_meta);
-                       CopyCatalogToFCB(&catInfo, vp);
-                       
-                       CLEAN_CATALOGDATA(&catInfo.nodeData);
-               }
-
-               vput(vp);
-               simple_lock(&mntvnode_slock);
-       }
-       simple_unlock(&mntvnode_slock);
+       FindMetaDataDirectory(vcb);
 
 
+       /* In case any volume information changed to trigger a notification */
+       hfs_generate_volume_notifications(hfsmp);
+    
        return (0);
 }
 
        return (0);
 }
 
@@ -829,48 +756,42 @@ loop:
 /*
  * Common code for mount and mountroot
  */
 /*
  * Common code for mount and mountroot
  */
-int
-hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mount_args *args)
+static int
+hfs_mountfs(struct vnode *devvp, struct mount *mp, struct hfs_mount_args *args,
+            vfs_context_t context)
 {
 {
-    int                         retval = E_NONE;
-    register struct hfsmount   *hfsmp;
-    struct buf                                 *bp;
-    dev_t                       dev;
-    HFSMasterDirectoryBlock            *mdbp;
-    int                         ronly;
-    struct ucred                               *cred;
+       struct proc *p = vfs_context_proc(context);
+       int retval = E_NONE;
+       struct hfsmount *hfsmp;
+       struct buf *bp;
+       dev_t dev;
+       HFSMasterDirectoryBlock *mdbp;
+       int ronly;
+       int i;
+       int mntwrapper;
+       kauth_cred_t cred;
        u_int64_t disksize;
        u_int64_t disksize;
-       u_int64_t blkcnt;
+       daddr64_t blkcnt;
        u_int32_t blksize;
        u_int32_t minblksize;
        u_int32_t blksize;
        u_int32_t minblksize;
-    DBG_VFS(("hfs_mountfs: mp = 0x%lX\n", (u_long)mp));
-
-    dev = devvp->v_rdev;
-    cred = p ? p->p_ucred : NOCRED;
-    /*
-     * 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);
+       u_int32_t iswritable;
+       daddr64_t mdb_offset;
 
 
-    ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
-    DBG_VFS(("hfs_mountfs: opening device...\n"));
-    if ((retval = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p)))
-        return (retval);
+       ronly = vfs_isrdonly(mp);
+       dev = vnode_specrdev(devvp);
+       cred = p ? vfs_context_ucred(context) : NOCRED;
+       mntwrapper = 0;
 
        bp = NULL;
        hfsmp = NULL;
 
        bp = NULL;
        hfsmp = NULL;
+       mdbp = NULL;
        minblksize = kHFSBlockSize;
 
        minblksize = kHFSBlockSize;
 
+       /* Advisory locking should be handled at the VFS layer */
+       vfs_setlocklocal(mp);
+
        /* Get the real physical block size. */
        /* 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;
        }
                retval = ENXIO;
                goto error_exit;
        }
@@ -878,39 +799,41 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
        if (blksize > 512) {
                u_int32_t size512 = 512;
 
        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. */
                        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)) {
                retval = ENXIO;
                goto error_exit;
        }
        /* Compute an accurate disk size (i.e. within 512 bytes) */
                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;
 
        /*
 
        /*
-        * For large volumes use a 4K physical block size.
+        * 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) {
                minblksize = blksize = 4096;
        }
         */
        if (blkcnt > (u_int64_t)0x000000007fffffff) {
                minblksize = blksize = 4096;
        }
-
+       
        /* Now switch to our prefered physical block size. */
        if (blksize > 512) {
        /* Now switch to our prefered 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. */
                        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;
                }
        }
                        retval = ENXIO;
                        goto error_exit;
                }
        }
-
        /*
         * At this point:
         *   minblksize is the minimum physical block size
        /*
         * At this point:
         *   minblksize is the minimum physical block size
@@ -918,42 +841,47 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
         *   blkcnt has the total number of physical blocks
         */
 
         *   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);
-       }
-
-       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;
        }
                goto error_exit;
        }
-       mdbp = (HFSMasterDirectoryBlock*) (bp->b_data + HFS_PRI_OFFSET(blksize));
+       MALLOC(mdbp, HFSMasterDirectoryBlock *, kMDBSize, M_TEMP, M_WAITOK);
+       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));
 
        MALLOC(hfsmp, struct hfsmount *, sizeof(struct hfsmount), M_HFSMNT, M_WAITOK);
        bzero(hfsmp, sizeof(struct hfsmount));
+       
+       /*
+        *  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_raw_dev = vnode_specrdev(devvp);
+       hfsmp->hfs_devvp = devvp;
+       hfsmp->hfs_phys_block_size = blksize;
+       hfsmp->hfs_phys_block_count = blkcnt;
+       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;
+       for (i = 0; i < MAXQUOTAS; i++)
+               dqfileinit(&hfsmp->hfs_qfiles[i]);
 
 
-       simple_lock_init(&hfsmp->hfs_renamelock);
-
-    /*
-     *  Init the volume information structure
-     */
-    mp->mnt_data = (qaddr_t)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_devvp = devvp;
-    hfsmp->hfs_phys_block_size = blksize;
-    hfsmp->hfs_phys_block_count = blkcnt;
-    hfsmp->hfs_fs_ronly = ronly;
-    hfsmp->hfs_unknownpermissions = ((mp->mnt_flag & MNT_UNKNOWNPERMISSIONS) != 0);
        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;
        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) {
                if (args->hfs_mask != (mode_t)VNOVAL) {
                        hfsmp->hfs_dir_mask = args->hfs_mask & ALLPERMS;
                        if (args->flags & HFSFSMNT_NOXONFILES) {
@@ -964,37 +892,53 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
                } else {
                        hfsmp->hfs_dir_mask = UNKNOWNPERMISSIONS & ALLPERMS;            /* 0777: rwx---rwx */
                        hfsmp->hfs_file_mask = UNKNOWNPERMISSIONS & DEFFILEMODE;        /* 0666: no --x by default? */
                } else {
                        hfsmp->hfs_dir_mask = UNKNOWNPERMISSIONS & ALLPERMS;            /* 0777: rwx---rwx */
                        hfsmp->hfs_file_mask = UNKNOWNPERMISSIONS & DEFFILEMODE;        /* 0666: no --x by default? */
-               };
+               }
+               if ((args->flags != (int)VNOVAL) && (args->flags & HFSFSMNT_WRAPPER))
+                       mntwrapper = 1;
        } else {
                /* Even w/o explicit mount arguments, MNT_UNKNOWNPERMISSIONS requires setting up uid, gid, and mask: */
        } 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;
                        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? */
                        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 (VNOP_IOCTL(devvp, DKIOCISWRITABLE, (caddr_t)&iswritable, 0, context) == 0) {
+               if (iswritable)
+                       hfsmp->hfs_flags |= HFS_WRITEABLE_MEDIA;
+               else
+                       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) &&
 
        /* Mount a standard HFS disk */
        if ((SWAP_BE16(mdbp->drSigWord) == kHFSSigWord) &&
-           (SWAP_BE16(mdbp->drEmbedSigWord) != kHFSPlusSigWord)) {
-               if (devvp == rootvp) {
+           (mntwrapper || (SWAP_BE16(mdbp->drEmbedSigWord) != kHFSPlusSigWord))) {
+               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;
                        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;
                        }
                                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;
                        }
                                retval = ENXIO;
                                goto error_exit;
                        }
-                       /* XXX do we need to call vfs_init_io_attributes again ? */
-                       devvp->v_specsize = blksize;
                        hfsmp->hfs_phys_block_size = blksize;
                        hfsmp->hfs_phys_block_count = blkcnt;
                }
                        hfsmp->hfs_phys_block_size = blksize;
                        hfsmp->hfs_phys_block_count = blkcnt;
                }
@@ -1006,7 +950,8 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
                        gTimeZone = args->hfs_timezone;
                }
 
                        gTimeZone = args->hfs_timezone;
                }
 
-               retval = hfs_getconverter(hfsmp->hfs_encoding, &hfsmp->hfs_get_unicode, &hfsmp->hfs_get_hfsname);
+               retval = hfs_getconverter(hfsmp->hfs_encoding, &hfsmp->hfs_get_unicode,
+                                       &hfsmp->hfs_get_hfsname);
                if (retval)
                        goto error_exit;
 
                if (retval)
                        goto error_exit;
 
@@ -1017,6 +962,7 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
        } else /* Mount an HFS Plus disk */ {
                HFSPlusVolumeHeader *vhp;
                off_t embeddedOffset;
        } else /* Mount an HFS Plus disk */ {
                HFSPlusVolumeHeader *vhp;
                off_t embeddedOffset;
+               int   jnl_disable = 0;
        
                /* Get the embedded Volume Header */
                if (SWAP_BE16(mdbp->drEmbedSigWord) == kHFSPlusSigWord) {
        
                /* Get the embedded Volume Header */
                if (SWAP_BE16(mdbp->drEmbedSigWord) == kHFSPlusSigWord) {
@@ -1024,15 +970,6 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
                        embeddedOffset += (u_int64_t)SWAP_BE16(mdbp->drEmbedExtent.startBlock) *
                                          (u_int64_t)SWAP_BE32(mdbp->drAlBlkSiz);
 
                        embeddedOffset += (u_int64_t)SWAP_BE16(mdbp->drEmbedExtent.startBlock) *
                                          (u_int64_t)SWAP_BE32(mdbp->drAlBlkSiz);
 
-                       disksize = (u_int64_t)SWAP_BE16(mdbp->drEmbedExtent.blockCount) *
-                                  (u_int64_t)SWAP_BE32(mdbp->drAlBlkSiz);
-
-                       hfsmp->hfs_phys_block_count = disksize / blksize;
-       
-                       brelse(bp);
-                       bp = NULL;
-                       mdbp = NULL;
-
                        /*
                         * If the embedded volume doesn't start on a block
                         * boundary, then switch the device to a 512-byte
                        /*
                         * If the embedded volume doesn't start on a block
                         * boundary, then switch the device to a 512-byte
@@ -1044,38 +981,115 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
                                    " a multiple of physical block size (%d);"
                                    " switching to 512\n", blksize);
                                blksize = 512;
                                    " 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;
                                }
                                        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;
                                }
                                        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;
                                hfsmp->hfs_phys_block_size = blksize;
                        }
 
                                /* Note: relative block count adjustment */
                                hfsmp->hfs_phys_block_count *=
                                    hfsmp->hfs_phys_block_size / blksize;
                                hfsmp->hfs_phys_block_size = blksize;
                        }
 
-                       retval = meta_bread(devvp, (embeddedOffset / blksize) + HFS_PRI_SECTOR(blksize),
-                                      blksize, cred, &bp);
-                       if (retval)
+                       disksize = (u_int64_t)SWAP_BE16(mdbp->drEmbedExtent.blockCount) *
+                                  (u_int64_t)SWAP_BE32(mdbp->drAlBlkSiz);
+
+                       hfsmp->hfs_phys_block_count = disksize / blksize;
+       
+                       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;
                                goto error_exit;
-                       vhp = (HFSPlusVolumeHeader*) (bp->b_data + HFS_PRI_OFFSET(blksize));
+                       bcopy((char *)buf_dataptr(bp) + HFS_PRI_OFFSET(blksize), mdbp, 512);
+                       buf_brelse(bp);
+                       bp = NULL;
+                       vhp = (HFSPlusVolumeHeader*) mdbp;
 
                } else /* pure HFS+ */ {
                        embeddedOffset = 0;
                        vhp = (HFSPlusVolumeHeader*) mdbp;
                }
 
 
                } else /* pure HFS+ */ {
                        embeddedOffset = 0;
                        vhp = (HFSPlusVolumeHeader*) mdbp;
                }
 
+               // XXXdbg
+               //
+               hfsmp->jnl = NULL;
+               hfsmp->jvp = NULL;
+               if (args != NULL && (args->flags & HFSFSMNT_EXTENDED_ARGS) && args->journal_disable) {
+                   jnl_disable = 1;
+               }
+                               
+               //
+               // We only initialize the journal here if the last person
+               // to mount this volume was journaling aware.  Otherwise
+               // we delay journal initialization until later at the end
+               // of hfs_MountHFSPlusVolume() because the last person who
+               // mounted it could have messed things up behind our back
+               // (so we need to go find the .journal file, make sure it's
+               // the right size, re-sync up if it was moved, etc).
+               //
+               if (   (SWAP_BE32(vhp->lastMountedVersion) == kHFSJMountVersion)
+                       && (SWAP_BE32(vhp->attributes) & kHFSVolumeJournaledMask)
+                       && !jnl_disable) {
+                       
+                       // if we're able to init the journal, mark the mount
+                       // point as journaled.
+                       //
+                       if (hfs_early_journal_init(hfsmp, vhp, args, embeddedOffset, mdb_offset, mdbp, cred) == 0) {
+                               vfs_setflags(mp, (uint64_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(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
+       
                (void) hfs_getconverter(0, &hfsmp->hfs_get_unicode, &hfsmp->hfs_get_hfsname);
 
                (void) hfs_getconverter(0, &hfsmp->hfs_get_unicode, &hfsmp->hfs_get_hfsname);
 
-               retval = hfs_MountHFSPlusVolume(hfsmp, vhp, embeddedOffset, disksize, p);
+               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.
                /*
                 * If the backend didn't like our physical blocksize
                 * then retry with physical blocksize of 512.
@@ -1084,60 +1098,149 @@ hfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, struct hfs_mo
                        printf("HFS Mount: could not use physical block size "
                                "(%d) switching to 512\n", blksize);
                        blksize = 512;
                        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;
                        }
                                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;
                        }
                                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 (in case this is an embedded volume). */
                        hfsmp->hfs_phys_block_count *= hfsmp->hfs_phys_block_size / blksize;
                        hfsmp->hfs_phys_block_size = blksize;
  
                        devvp->v_specsize = blksize;
                        /* Note: relative block count adjustment (in case this is an embedded volume). */
                        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, (uint64_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... */
                        /* Try again with a smaller block size... */
-                       retval = hfs_MountHFSPlusVolume(hfsmp, vhp, embeddedOffset, disksize, p);
+                       retval = hfs_MountHFSPlusVolume(hfsmp, vhp, embeddedOffset, disksize, p, args, cred);
                }
                if (retval)
                        (void) hfs_relconverter(0);
        }
 
                }
                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;
        }
 
        if ( retval ) {
                goto error_exit;
        }
 
-    brelse(bp);
-    bp = NULL;
+       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 (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);
+       };
+       
+       /*
+        * 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);
        
        
-    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;
-
-    if (ronly == 0) {
-        hfsmp->hfs_fs_clean = 0;
-        if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)
-               (void) hfs_flushvolumeheader(hfsmp, MNT_WAIT);
-        else
-               (void) hfs_flushMDB(hfsmp, MNT_WAIT);
-    }
-    goto std_exit;
+       if (ronly == 0) {
+               (void) hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
+       }
+       FREE(mdbp, M_TEMP);
+       return (0);
 
 error_exit:
 
 error_exit:
-        DBG_VFS(("hfs_mountfs: exiting with error %d...\n", retval));
-
-    if (bp)
-        brelse(bp);
-    (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, cred, p);
-    if (hfsmp) {
-        FREE(hfsmp, M_HFSMNT);
-        mp->mnt_data = (qaddr_t)0;
-    }
-
-std_exit:
+       if (bp)
+               buf_brelse(bp);
+       if (mdbp)
+               FREE(mdbp, M_TEMP);
+
+       if (hfsmp && hfsmp->jvp && hfsmp->jvp != hfsmp->hfs_devvp) {
+           (void)VNOP_CLOSE(hfsmp->jvp, ronly ? FREAD : FREAD|FWRITE, context);
+               hfsmp->jvp = NULL;
+       }
+       if (hfsmp) {
+               FREE(hfsmp, M_HFSMNT);
+               vfs_setfsprivate(mp, NULL);
+       }
         return (retval);
 }
 
         return (retval);
 }
 
@@ -1147,175 +1250,382 @@ std_exit:
  * Nothing to do at the moment.
  */
 /* ARGSUSED */
  * Nothing to do at the moment.
  */
 /* ARGSUSED */
-int hfs_start(mp, flags, p)
-struct mount *mp;
-int flags;
-struct proc *p;
+static int
+hfs_start(__unused struct mount *mp, __unused int flags, __unused vfs_context_t context)
 {
 {
-    DBG_FUNC_NAME("hfs_start");
-    DBG_PRINT_FUNC_NAME();
-
-    return (0);
+       return (0);
 }
 
 
 /*
  * unmount system call
  */
 }
 
 
 /*
  * unmount system call
  */
-int
-hfs_unmount(mp, mntflags, p)
-       struct mount *mp;
-       int mntflags;
-       struct proc *p;
+static int
+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;
        struct hfsmount *hfsmp = VFSTOHFS(mp);
        int retval = E_NONE;
        int flags;
+       int force;
+       int started_tr = 0;
 
        flags = 0;
 
        flags = 0;
-       if (mntflags & MNT_FORCE)
+       force = 0;
+       if (mntflags & MNT_FORCE) {
                flags |= FORCECLOSE;
                flags |= FORCECLOSE;
+               force = 1;
+       }
 
 
-       if ((retval = hfs_flushfiles(mp, flags)))
+       if ((retval = hfs_flushfiles(mp, flags, p)) && !force)
                return (retval);
 
                return (retval);
 
+       if (hfsmp->hfs_flags & HFS_METADATA_ZONE)
+               (void) hfs_recording_suspend(hfsmp);
+
        /*
         * Flush out the b-trees, volume bitmap and Volume Header
         */
        /*
         * Flush out the b-trees, volume bitmap and Volume Header
         */
-       if (hfsmp->hfs_fs_ronly == 0) {
-               retval = VOP_FSYNC(HFSTOVCB(hfsmp)->catalogRefNum, NOCRED, MNT_WAIT, p);
-               if (retval && ((mntflags & MNT_FORCE) == 0))
-                       return (retval);
+       if ((hfsmp->hfs_flags & HFS_READ_ONLY) == 0) {
+               hfs_start_transaction(hfsmp);
+               started_tr = 1;
+
+               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;
+               }
 
 
-               retval = VOP_FSYNC(HFSTOVCB(hfsmp)->extentsRefNum, NOCRED, MNT_WAIT, p);
-               if (retval && ((mntflags & MNT_FORCE) == 0))
-                       return (retval);
+               (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;
+               
+               (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 (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 ((mntflags & MNT_FORCE) == 0)
-                               return (retval);
+               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;
                }
                }
-               
+#if 0          
                /* See if this volume is damaged, is so do not unmount cleanly */
                if (HFSTOVCB(hfsmp)->vcbFlags & kHFS_DamagedVolume) {
                /* See if this volume is damaged, is so do not unmount cleanly */
                if (HFSTOVCB(hfsmp)->vcbFlags & kHFS_DamagedVolume) {
-                       hfsmp->hfs_fs_clean = 0;
                        HFSTOVCB(hfsmp)->vcbAtrb &= ~kHFSVolumeUnmountedMask;
                } else {
                        HFSTOVCB(hfsmp)->vcbAtrb &= ~kHFSVolumeUnmountedMask;
                } else {
-            hfsmp->hfs_fs_clean = 1;
-            HFSTOVCB(hfsmp)->vcbAtrb |= kHFSVolumeUnmountedMask;
+                       HFSTOVCB(hfsmp)->vcbAtrb |= kHFSVolumeUnmountedMask;
                }
                }
-               if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSPlusSigWord)
-                       retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT);
-               else
-                       retval = hfs_flushMDB(hfsmp, MNT_WAIT);
-       
+#else
+               HFSTOVCB(hfsmp)->vcbAtrb |= kHFSVolumeUnmountedMask;
+#endif
+               retval = hfs_flushvolumeheader(hfsmp, MNT_WAIT, 0);
                if (retval) {
                if (retval) {
-                       hfsmp->hfs_fs_clean = 0;
                        HFSTOVCB(hfsmp)->vcbAtrb &= ~kHFSVolumeUnmountedMask;
                        HFSTOVCB(hfsmp)->vcbAtrb &= ~kHFSVolumeUnmountedMask;
-                       if ((mntflags & MNT_FORCE) == 0)
-                               return (retval);        /* could not flush everything */
+                       if (!force)
+                               goto err_exit;  /* could not flush everything */
                }
                }
+
+               hfs_end_transaction(hfsmp);
+               started_tr = 0;
        }
 
        }
 
+       if (hfsmp->jnl) {
+               journal_flush(hfsmp->jnl);
+       }
+       
        /*
         *      Invalidate our caches and release metadata vnodes
         */
        (void) hfsUnmount(hfsmp, p);
 
        /*
         *      Invalidate our caches and release metadata vnodes
         */
        (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);
 
        if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord)
                (void) hfs_relconverter(hfsmp->hfs_encoding);
 
-       hfsmp->hfs_devvp->v_specflags &= ~SI_MOUNTEDON;
-       retval = VOP_CLOSE(hfsmp->hfs_devvp, hfsmp->hfs_fs_ronly ? FREAD : FREAD|FWRITE,
-                       NOCRED, p);
-       vrele(hfsmp->hfs_devvp);
+       // 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 = VNOP_CLOSE(hfsmp->jvp,
+                              hfsmp->hfs_flags & HFS_READ_ONLY ? FREAD : FREAD|FWRITE,
+                              context);
+           vnode_put(hfsmp->jvp);
+           hfsmp->jvp = NULL;
+       }
+       // XXXdbg
+
+#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;
+
+               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);
        FREE(hfsmp, M_HFSMNT);
        FREE(hfsmp, M_HFSMNT);
-       mp->mnt_data = (qaddr_t)0;
 
 
-       return (retval);
+       return (0);
+
+  err_exit:
+       if (started_tr) {
+               hfs_end_transaction(hfsmp);
+       }
+       return retval;
 }
 
 
 /*
  * Return the root of a filesystem.
 }
 
 
 /*
  * Return the root of a filesystem.
- *
- *              OUT - vpp, should be locked and vget()'d (to increment usecount and lock)
  */
  */
-int hfs_root(mp, vpp)
-struct mount *mp;
-struct vnode **vpp;
+static int
+hfs_vfs_root(struct mount *mp, struct vnode **vpp, __unused vfs_context_t context)
 {
 {
-    struct vnode *nvp;
-    int retval;
-    UInt32 rootObjID = kRootDirID;
-
-    DBG_FUNC_NAME("hfs_root");
-    DBG_PRINT_FUNC_NAME();
-
-    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
  */
 }
 
 
 /*
  * 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;
+static int
+hfs_quotactl(struct mount *mp, int cmds, uid_t uid, caddr_t datap, vfs_context_t context)
 {
 {
-    DBG_FUNC_NAME("hfs_quotactl");
-    DBG_PRINT_FUNC_NAME();
+       struct proc *p = vfs_context_proc(context);
+       int cmd, type, error;
+
+#if !QUOTA
+       return (ENOTSUP);
+#else
+       if (uid == -1)
+               uid = vfs_context_ucred(context)->cr_ruid;
+       cmd = cmds >> SUBCMDSHIFT;
+
+       switch (cmd) {
+       case Q_SYNC:
+       case Q_QUOTASTAT:
+               break;
+       case Q_GETQUOTA:
+               if (uid == vfs_context_ucred(context)->cr_ruid)
+                       break;
+               /* fall through */
+       default:
+               if ( (error = vfs_context_suser(context)) )
+                       return (error);
+       }
 
 
-    return (EOPNOTSUPP);
+       type = cmds & SUBCMDMASK;
+       if ((u_int)type >= MAXQUOTAS)
+               return (EINVAL);
+       if (vfs_busy(mp, LK_NOWAIT))
+               return (0);
+
+       switch (cmd) {
+
+       case Q_QUOTAON:
+               error = hfs_quotaon(p, mp, type, datap);
+               break;
+
+       case Q_QUOTAOFF:
+               error = hfs_quotaoff(p, mp, type);
+               break;
+
+       case Q_SETQUOTA:
+               error = hfs_setquota(mp, uid, type, datap);
+               break;
+
+       case Q_SETUSE:
+               error = hfs_setuse(mp, uid, type, datap);
+               break;
+
+       case Q_GETQUOTA:
+               error = hfs_getquota(mp, uid, type, datap);
+               break;
+
+       case Q_SYNC:
+               error = hfs_qsync(mp);
+               break;
+
+       case Q_QUOTASTAT:
+               error = hfs_quotastat(mp, type, datap);
+               break;
+
+       default:
+               error = EINVAL;
+               break;
+       }
+       vfs_unbusy(mp);
+
+       return (error);
+#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
 
 /*
  * 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;
 {
        ExtendedVCB *vcb = VFSTOVCB(mp);
        struct hfsmount *hfsmp = VFSTOHFS(mp);
        u_long freeCNIDs;
-
-       DBG_FUNC_NAME("hfs_statfs");
-       DBG_PRINT_FUNC_NAME();
+       uint16_t subtype = 0;
 
        freeCNIDs = (u_long)0xFFFFFFFF - (u_long)vcb->vcbNxtCNID;
 
 
        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 = vcb->freeBlocks;
-       sbp->f_bavail = vcb->freeBlocks;
-       sbp->f_files = vcb->totalBlocks - 2;  /* max files is constrained by total blocks */
-       sbp->f_ffree = MIN(freeCNIDs, vcb->freeBlocks);
-       
-       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 = (uint32_t)vcb->blockSize;
+       sbp->f_iosize = (size_t)(MAX_UPL_TRANSFER * PAGE_SIZE);
+       sbp->f_blocks = (uint64_t)((unsigned long)vcb->totalBlocks);
+       sbp->f_bfree = (uint64_t)((unsigned long )hfs_freeblks(hfsmp, 0));
+       sbp->f_bavail = (uint64_t)((unsigned long )hfs_freeblks(hfsmp, 1));
+       sbp->f_files = (uint64_t)((unsigned long )(vcb->totalBlocks - 2));  /* max files is constrained by total blocks */
+       sbp->f_ffree = (uint64_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);
 }
 
 
        return (0);
 }
 
 
+//
+// XXXdbg -- this is a callback to be used by the journal to
+//           get meta data blocks flushed out to disk.
+//
+// XXXdbg -- be smarter and don't flush *every* block on each
+//           call.  try to only flush some so we don't wind up
+//           being too synchronous.
+//
+__private_extern__
+void
+hfs_sync_metadata(void *arg)
+{
+       struct mount *mp = (struct mount *)arg;
+       struct hfsmount *hfsmp;
+       ExtendedVCB *vcb;
+       buf_t   bp;
+       int  sectorsize, retval;
+       daddr64_t priIDSector;
+       hfsmp = VFSTOHFS(mp);
+       vcb = HFSTOVCB(hfsmp);
+
+       // now make sure the super block is flushed
+       sectorsize = hfsmp->hfs_phys_block_size;
+       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) {
+               panic("hfs: sync_metadata: can't read super-block?! (retval 0x%x, priIDSector)\n",
+                         retval, priIDSector);
+       }
+
+       if (retval == 0 && ((buf_flags(bp) & (B_DELWRI | B_LOCKED)) == B_DELWRI)) {
+           buf_bwrite(bp);
+       } else if (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...
+       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);
+               }
+       }
+}
+
+
+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;
 /*
  * Go through the disk queues to initiate sandbagged IO;
  * go through the inodes to write those that have been modified;
@@ -1323,145 +1633,115 @@ hfs_statfs(mp, sbp, p)
  *
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */
  *
  * 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;
+static int
+hfs_sync(struct mount *mp, int waitfor, vfs_context_t context)
 {
 {
-    struct vnode               *nvp, *vp;
-    struct hfsnode             *hp;
-    struct hfsmount            *hfsmp = VFSTOHFS(mp);
-    ExtendedVCB                        *vcb;
-    struct vnode               *meta_vp[3];
-    int i;
-    int error, allerror = 0;
-
-    DBG_FUNC_NAME("hfs_sync");
-    DBG_PRINT_FUNC_NAME();
+       struct proc *p = vfs_context_proc(context);
+       struct cnode *cp;
+       struct hfsmount *hfsmp;
+       ExtendedVCB *vcb;
+       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
         */
 
        /*
         * During MNT_UPDATE hfs_changefs might be manipulating
         * vnodes so back off
         */
-       if (mp->mnt_flag & MNT_UPDATE)
+       if (((uint32_t)vfs_flags(mp)) & MNT_UPDATE)     /* XXX MNT_UPDATE may not be visible here */
                return (0);
 
                return (0);
 
-    hfsmp = VFSTOHFS(mp);
-    if (hfsmp->hfs_fs_ronly != 0) {
-        panic("update: rofs mod");
-    };
-
-    /*
-     * Write back each 'modified' vnode
-     */
-
-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;
-        hp = VTOH(vp);
-
-        if ((vp->v_flag & VSYSTEM) || (vp->v_type == VNON) ||
-            (((hp->h_nodeflags & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_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;
-        }
+       hfsmp = VFSTOHFS(mp);
+       if (hfsmp->hfs_flags & HFS_READ_ONLY)
+               return (EROFS);
 
 
-        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))) {
-            DBG_ERR(("hfs_sync: error %d calling fsync on vnode 0x%X.\n", error, (u_int)vp));
-            allerror = error;
-        };
-        DBG_ASSERT(*((volatile int *)(&(vp)->v_interlock))==0);
-        VOP_UNLOCK(vp, 0, p);
-               if (didhold)
-                       ubc_rele(vp);
-        vrele(vp);
-        simple_lock(&mntvnode_slock);
-    };
-
-    vcb = HFSTOVCB(hfsmp);
-    meta_vp[0] = vcb->extentsRefNum;
-    meta_vp[1] = vcb->catalogRefNum;
-    meta_vp[2] = vcb->allocationsRefNum;  /* This is NULL for standard HFS */
-
-    /* Now sync our three metadata files */
-    for (i = 0; i < 3; ++i) {
-       struct vnode *btvp;
-  
-        btvp = meta_vp[i];
-
-        if ((btvp==0) || (btvp->v_type == VNON) || (btvp->v_mount != mp))
-            continue;
-        simple_lock(&btvp->v_interlock);
-        hp = VTOH(btvp);
-        if (((hp->h_nodeflags & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0) &&
-            (btvp->v_dirtyblkhd.lh_first == NULL) && !(btvp->v_flag & VHASDIRTY)) {
-            simple_unlock(&btvp->v_interlock);
-            continue;
-        }
-        simple_unlock(&mntvnode_slock);
-        error = vget(btvp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, p);
-        if (error) {
-            simple_lock(&mntvnode_slock);
-            continue;
-        }
-        if ((error = VOP_FSYNC(btvp, cred, waitfor, p)))
-            allerror = error;
-        VOP_UNLOCK(btvp, 0, p);
-        vrele(btvp);
-        simple_lock(&mntvnode_slock);
-    };
-
-    simple_unlock(&mntvnode_slock);
-
-    /*
-     * Force stale file system control information to be flushed.
-     */
-    if (vcb->vcbSigWord == kHFSSigWord) {
-        if ((error = VOP_FSYNC(hfsmp->hfs_devvp, cred, waitfor, p)))
-            allerror = error;
-    }
-    /*
-     * Write back modified superblock.
-     */
-
-    if (IsVCBDirty(vcb)) {
-       if (vcb->vcbSigWord == kHFSPlusSigWord)
-               error = hfs_flushvolumeheader(hfsmp, waitfor);
-       else
-               error = hfs_flushMDB(hfsmp, waitfor);
-       
-        if (error)
-            allerror = error;
-    };
-
-    return (allerror);
+       /* skip over frozen volumes */
+       if (!lck_rw_try_lock_shared(&hfsmp->hfs_insync))
+               return 0;
+
+       args.cred = vfs_context_proc(context);
+       args.waitfor = waitfor;
+       args.p = p;
+       args.error = 0;
+       /*
+        * 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);
+
+       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 < 4; ++i) {
+               struct vnode *btvp;
+
+               btvp = meta_vp[i];;
+               if ((btvp==0) || (vnode_mount(btvp) != mp))
+                       continue;
+
+               /* XXX use hfs_systemfile_lock instead ? */
+               (void) hfs_lock(VTOC(btvp), HFS_EXCLUSIVE_LOCK);
+               cp = VTOC(btvp);
+
+               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;
+               }
+               error = vnode_get(btvp);
+               if (error) {
+                       hfs_unlock(VTOC(btvp));
+                       continue;
+               }
+               if ((error = hfs_fsync(btvp, waitfor, 0, p)))
+                       allerror = error;
+
+               hfs_unlock(cp);
+               vnode_put(btvp);
+       };
+
+       /*
+        * Force stale file system control information to be flushed.
+        */
+       if (vcb->vcbSigWord == kHFSSigWord) {
+               if ((error = VNOP_FSYNC(hfsmp->hfs_devvp, waitfor, context))) {
+                       allerror = error;
+               }
+       }
+#if QUOTA
+       hfs_qsync(mp);
+#endif /* QUOTA */
+
+       hfs_hotfilesync(hfsmp, p);
+       /*
+        * Write back modified superblock.
+        */
+
+       if (IsVCBDirty(vcb)) {
+               error = hfs_flushvolumeheader(hfsmp, waitfor, 0);
+               if (error)
+                       allerror = error;
+       }
+
+       if (hfsmp->jnl) {
+           journal_flush(hfsmp->jnl);
+       }
+
+       lck_rw_unlock_shared(&hfsmp->hfs_insync);       
+       return (allerror);
 }
 
 
 }
 
 
@@ -1469,42 +1749,31 @@ loop:;
  * File handle to vnode
  *
  * Have to be really careful about stale file handles:
  * File handle to vnode
  *
  * Have to be really careful about stale file handles:
- * - check that the hfsnode number is valid
- * - call hfs_vget() to get the locked hfsnode
- * - check for an unallocated hfsnode (i_mode == 0)
+ * - check that the cnode id is valid
+ * - call hfs_vget() to get the locked cnode
+ * - check for an unallocated cnode (i_mode == 0)
  * - check that the given client host has export rights and return
  *   those rights via. exflagsp and credanonp
  */
  * - check that the given client host has export rights and return
  *   those rights via. exflagsp and credanonp
  */
-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;
+static int
+hfs_fhtovp(struct mount *mp, int fhlen, unsigned char *fhp, struct vnode **vpp, vfs_context_t context)
 {
        struct hfsfid *hfsfhp;
        struct vnode *nvp;
        int result;
 {
        struct hfsfid *hfsfhp;
        struct vnode *nvp;
        int result;
-       struct netcred *np;
-    DBG_FUNC_NAME("hfs_fhtovp");
-    DBG_PRINT_FUNC_NAME();
 
        *vpp = NULL;
        hfsfhp = (struct hfsfid *)fhp;
 
 
        *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 < 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), 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
        
        /* The createtime can be changed by hfs_setattr or hfs_setattrlist.
         * For NFS, we are assuming that only if the createtime was moved
@@ -1517,16 +1786,15 @@ struct ucred **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.
         */  
         * 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 < VTOH(nvp)->h_meta->h_crtime)) {
-               vput(nvp);
-               return ESTALE;
-       };
-       
+       if ((hfsfhp->hfsfid_gen < VTOC(nvp)->c_itime)) {
+               hfs_unlock(VTOC(nvp));
+               vnode_put(nvp);
+               return (ESTALE);
+       }
        *vpp = nvp;
        *vpp = nvp;
-       *exflagsp = np->netc_exflags;
-       *credanonp = &np->netc_anon;
-       
-    return 0;
+
+       hfs_unlock(VTOC(nvp));
+       return (0);
 }
 
 
 }
 
 
@@ -1534,251 +1802,645 @@ struct ucred **credanonp;
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
-static int hfs_vptofh(vp, fhp)
-struct vnode *vp;
-struct fid *fhp;
+static int
+hfs_vptofh(struct vnode *vp, int *fhlenp, unsigned char *fhp, vfs_context_t context)
 {
 {
-       struct hfsnode *hp;
+       struct cnode *cp;
        struct hfsfid *hfsfhp;
        struct hfsfid *hfsfhp;
-       struct proc *p = current_proc();
-       int result;
-    u_int32_t fileID;
-    DBG_FUNC_NAME("hfs_vptofh");
-    DBG_PRINT_FUNC_NAME();
 
 
-       hp = VTOH(vp);
-       hfsfhp = (struct hfsfid *)fhp;
-       
-       /* If a file handle is requested for a file on an HFS volume we must be sure
-               to create the thread record before returning the object id in the filehandle
-               to make sure the file can be retrieved by fileid if necessary:
-        */
-       if ((vp->v_type == VREG) && ISHFS(VTOVCB(vp))) {
-               /* Create a thread record and return the FileID [which is the file's fileNumber] */
-               /* lock catalog b-tree */
-               if ((result = hfs_metafilelocking(VTOHFS(vp), kHFSCatalogFileID, LK_EXCLUSIVE, p)) != 0) return result;
-               result = hfsCreateFileID(VTOVCB(vp), H_DIRID(hp), H_NAME(hp), H_HINT(hp), &fileID);
-               (void) hfs_metafilelocking(VTOHFS(vp), kHFSCatalogFileID, LK_RELEASE, p);
-               if (result) {
-                       DBG_ERR(("hfs_vptofh: error %d on CreateFileIDRef.\n", result));
-                       return result;
-               };
-               DBG_ASSERT(fileID == H_FILEID(hp));
-       };
+       if (ISHFS(VTOVCB(vp)))
+               return (ENOTSUP);       /* hfs standard is not exportable */
 
 
-       hfsfhp->hfsfid_len = sizeof(struct hfsfid);
-       hfsfhp->hfsfid_pad = 0;
-       hfsfhp->hfsfid_cnid = H_FILEID(hp);
-       hfsfhp->hfsfid_gen = hp->h_meta->h_crtime;
+       if (*fhlenp < (int)sizeof(struct hfsfid))
+               return (EOVERFLOW);
+
+       cp = VTOC(vp);
+       hfsfhp = (struct hfsfid *)fhp;
+       hfsfhp->hfsfid_cnid = cp->c_fileid;
+       hfsfhp->hfsfid_gen = cp->c_itime;
+       *fhlenp = sizeof(struct hfsfid);
        
        
-       return 0;
+       return (0);
 }
 
 
 /*
  * Initial HFS filesystems, done only once.
  */
 }
 
 
 /*
  * Initial HFS filesystems, done only once.
  */
-int
-hfs_init(vfsp)
-struct vfsconf *vfsp;
+static int
+hfs_init(__unused struct vfsconf *vfsp)
 {
 {
-    int i;
-    static int done = 0;
-    OSErr err;
+       static int done = 0;
 
 
-    DBG_FUNC_NAME("hfs_init");
-    DBG_PRINT_FUNC_NAME();
+       if (done)
+               return (0);
+       done = 1;
+       hfs_chashinit();
+       hfs_converterinit();
+#if QUOTA
+       dqinit();
+#endif /* QUOTA */
+
+       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);
 
 
-    if (done)
-        return (0);
-    done = 1;
-    hfs_vhashinit();
-    hfs_converterinit();
+       /* Turn on lock debugging */
+       //lck_attr_setdebug(hfs_lock_attr);
 
 
-    simple_lock_init (&gBufferPtrListLock);
 
 
-    for (i = BUFFERPTRLISTSIZE - 1; i >= 0; --i) {
-        gBufferAddress[i] = NULL;
-        gBufferHeaderPtr[i] = NULL;
-    };
-    gBufferListIndex = 0;
+       return (0);
+}
 
 
-       /*
-        * Allocate Catalog Iterator cache...
-        */
-       err = InitCatalogCache();
+static int
+hfs_getmountpoint(vp, hfsmpp)
+       struct vnode *vp;
+       struct hfsmount **hfsmpp;
+{
+       struct hfsmount * hfsmp;
+       char fstypename[MFSNAMELEN];
 
 
-    return E_NONE;
-}
+       if (vp == NULL)
+               return (EINVAL);
+       
+       if (!vnode_isvroot(vp))
+               return (EINVAL);
 
 
+       vnode_vfsname(vp, fstypename);
+       if (strcmp(fstypename, "hfs") != 0)
+               return (EINVAL);
 
 
-/*
- * fast 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;
-{
-    DBG_FUNC_NAME("hfs_sysctl");
-    DBG_PRINT_FUNC_NAME();
+       hfsmp = VTOHFS(vp);
+
+       if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord)
+               return (EINVAL);
+
+       *hfsmpp = hfsmp;
 
 
-    return (EOPNOTSUPP);
+       return (0);
 }
 
 }
 
+// XXXdbg
+#include <sys/filedesc.h>
 
 
-/*     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.
+/*
+ * HFS filesystem related variables.
  */
  */
-int
-hfs_vget(struct mount *mp,
-         void *ino,
-         struct vnode **vpp)
+static int
+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)
 {
 {
-    struct hfsmount    *hfsmp;
-    dev_t                              dev;
-    int                                retval = E_NONE;
+       struct proc *p = vfs_context_proc(context);
+       int error;
+       struct hfsmount *hfsmp;
 
 
-    DBG_VFS(("hfs_vget: ino = %ld\n", *(UInt32 *)ino));
+       /* all sysctl names at this level are terminal */
 
 
-       /* Check if unmount in progress */
-       if (mp->mnt_kern_flag & MNTK_UNMOUNT) {
-               *vpp = NULL;
-               return (EPERM);
-       }
+       if (name[0] == HFS_ENCODINGBIAS) {
+               u_int32_t bias;
+
+               bias = hfs_getencodingbias();
+               error = sysctl_int(oldp, oldlenp, newp, newlen, &bias);
+               if (error == 0 && newp)
+                       hfs_setencodingbias(bias);
+               return (error);
 
 
-    hfsmp = VFSTOHFS(mp);
-    dev = hfsmp->hfs_raw_dev;
+       } else if (name[0] == HFS_EXTEND_FS) {
+        u_int64_t  newsize;
+               vnode_t vp = p->p_fd->fd_cdir;
+
+               if (newp == USER_ADDR_NULL || vp == NULL)
+                       return (EINVAL);
+               if ((error = hfs_getmountpoint(vp, &hfsmp)))
+                       return (error);
+               error = sysctl_quad(oldp, oldlenp, newp, newlen, &newsize);
+               if (error)
+                       return (error);
        
        
-       /* First check to see if it is in the cache */
-    *vpp = hfs_vhashget(dev, *(UInt32 *)ino, kDefault);
-
-       /* hide open files that have been deleted */
-    if (*vpp != NULL) {
-            if ((VTOH(*vpp)->h_meta->h_metaflags & IN_NOEXISTS) ||
-                (hfsmp->hfs_private_metadata_dir != 0) &&
-                (H_DIRID(VTOH(*vpp)) == hfsmp->hfs_private_metadata_dir)) {
-                    vput(*vpp);
-                    retval = ENOENT;
-                    goto Err_Exit;
-            }
-    }
-    
-       /* The vnode is not in the cache, so lets make it */
-    if (*vpp == NULL)
-      {
-       hfsCatalogInfo          catInfo;
-        struct proc                    *p = current_proc();
-        UInt8                          forkType;
-
-               INIT_CATALOGDATA(&catInfo.nodeData, 0);
-               catInfo.hint = kNoHint;
-               /* Special-case the root's parent directory (DirID = 1) because
-                  it doesn't actually exist in the catalog: */
-               if ((*vpp == NULL) && (*(UInt32 *)ino == kRootParID)) {
-                       bzero(&catInfo, sizeof(catInfo));
-                       catInfo.nodeData.cnd_type = kCatalogFolderNode;
-                       catInfo.nodeData.cnm_nameptr = catInfo.nodeData.cnm_namespace;
-                       catInfo.nodeData.cnm_namespace[0] = '/';
-                       catInfo.nodeData.cnm_length = 1;
-                       catInfo.nodeData.cnd_nodeID = kRootParID;
-                       catInfo.nodeData.cnm_parID = kRootParID;
-                       catInfo.nodeData.cnd_valence = 1;
-                       catInfo.nodeData.cnd_ownerID = 0;
-                       catInfo.nodeData.cnd_groupID = 0;
-                       catInfo.nodeData.cnd_mode = (S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO);
-            } else {
-
-            /* lock catalog b-tree */
-            retval = hfs_metafilelocking(hfsmp, kHFSCatalogFileID, LK_SHARED, p);
-            if (retval != E_NONE) goto Lookup_Err_Exit;
-
-            retval = hfs_getcatalog(VFSTOVCB(mp), *(UInt32 *)ino, NULL, -1, &catInfo);
-
-            /* unlock catalog b-tree */
-            (void) hfs_metafilelocking(hfsmp, kHFSCatalogFileID, LK_RELEASE, p);
-
-            if (retval != E_NONE) goto Lookup_Err_Exit;
-
-            /* hide open files that have been deleted */
-            if ((hfsmp->hfs_private_metadata_dir != 0) &&
-               (catInfo.nodeData.cnm_parID == hfsmp->hfs_private_metadata_dir)) {
-                retval = ENOENT;
-                goto Lookup_Err_Exit;
-                };
-            };
-
-        forkType = (catInfo.nodeData.cnd_type == kCatalogFolderNode) ? kDirectory : kDataFork;
-        retval = hfs_vcreate(VFSTOVCB(mp), &catInfo, forkType, vpp);
-               
-Lookup_Err_Exit:
-               CLEAN_CATALOGDATA(&catInfo.nodeData);
-      };
+               error = hfs_extendfs(hfsmp, newsize, context);          
+               return (error);
 
 
-       UBCINFOCHECK("hfs_vget", *vpp);
+       } else if (name[0] == HFS_ENCODINGHINT) {
+               size_t bufsize;
+               size_t bytes;
+               u_int32_t hint;
+               u_int16_t *unicode_name;
+               char *filename;
+
+               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(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, &hint);
+                       }
+               }
+               FREE(unicode_name, M_TEMP);
+               FREE(filename, M_TEMP);
+               return (error);
 
 
-Err_Exit:
+       } else if (name[0] == HFS_ENABLE_JOURNALING) {
+               // make the file system journaled...
+               struct vnode *vp = p->p_fd->fd_cdir, *jvp;
+               ExtendedVCB *vcb;
+               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 (!is_suser()) {
+                       return (EPERM);
+               }
+               if (vp == NULL)
+                       return EINVAL;
 
 
-       /* rember if a parent directory was looked up by CNID */
-       if (retval == 0 && ((*vpp)->v_type == VDIR)
-           && lockstatus(&mp->mnt_lock) != LK_SHARED)
-               VTOH(*vpp)->h_nodeflags |= IN_BYCNID;
+               hfsmp = VTOHFS(vp);
+               if (hfsmp->hfs_flags & HFS_READ_ONLY) {
+                       return EROFS;
+               }
+               if (HFSTOVCB(hfsmp)->vcbSigWord == kHFSSigWord) {
+                       printf("hfs: can't make a plain hfs volume journaled.\n");
+                       return EINVAL;
+               }
 
 
-    return (retval);
+               if (hfsmp->jnl) {
+                   printf("hfs: volume @ mp 0x%x 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) {
 
 
-/*
- * Flush out all the files in a filesystem.
- */
-int
-hfs_flushfiles(struct mount *mp, int flags)
-{
-       int error;
+                       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);
 
 
-       error = vflush(mp, NULLVP, (SKIPSYSTEM | SKIPSWAP | flags));
-       error = vflush(mp, NULLVP, (SKIPSYSTEM | flags));
+               // make sure these both exist!
+               if (   GetFileInfo(vcb, kHFSRootFolderID, ".journal_info_block", &jinfo_attr, &jinfo_fork) == 0
+                       || GetFileInfo(vcb, kHFSRootFolderID, ".journal", &jnl_attr, &jnl_fork) == 0) {
 
 
-       return (error);
-}
+                       return EINVAL;
+               }
 
 
-short hfs_flushMDB(struct hfsmount *hfsmp, int waitfor)
-{
-       ExtendedVCB                     *vcb = HFSTOVCB(hfsmp);
-       FCB                                             *fcb;
-       HFSMasterDirectoryBlock *mdb;
-       struct buf                              *bp;
-       int                                             retval;
-       int                     size = kMDBSize;        /* 512 */
-       ByteCount                               namelen;
+               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]);
+
+               jvp = hfsmp->hfs_devvp;
+               jnl = journal_create(jvp,
+                                                        (off_t)name[2] * (off_t)HFSTOVCB(hfsmp)->blockSize
+                                                        + HFSTOVCB(hfsmp)->hfsPlusIOPosOffset,
+                                                        (off_t)((unsigned)name[3]),
+                                                        hfsmp->hfs_devvp,
+                                                        hfsmp->hfs_phys_block_size,
+                                                        0,
+                                                        0,
+                                                        hfs_sync_metadata, hfsmp->hfs_mp);
+
+               if (jnl == NULL) {
+                       printf("hfs: FAILED to create the journal!\n");
+                       if (jvp && jvp != hfsmp->hfs_devvp) {
+                               VNOP_CLOSE(jvp, hfsmp->hfs_flags & HFS_READ_ONLY ? FREAD : FREAD|FWRITE, context);
+                       }
+                       jvp = NULL;
 
 
-       if (vcb->vcbSigWord != kHFSSigWord)
-               return EINVAL;
+                       return EINVAL;
+               } 
 
 
-    DBG_ASSERT(hfsmp->hfs_devvp != NULL);
+               hfs_global_exclusive_lock_acquire(hfsmp);
+               
+               HFSTOVCB(hfsmp)->vcbJinfoBlock = name[1];
+               HFSTOVCB(hfsmp)->vcbAtrb |= kHFSVolumeJournaledMask;
+               hfsmp->jvp = jvp;
+               hfsmp->jnl = jnl;
+
+               // 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;
+
+               vfs_setflags(hfsmp->hfs_mp, (uint64_t)((unsigned int)MNT_JOURNALED));
+
+               hfs_global_exclusive_lock_release(hfsmp);
+               hfs_flushvolumeheader(hfsmp, MNT_WAIT, 1);
+
+               return 0;
+       } else if (name[0] == HFS_DISABLE_JOURNALING) {
+               // clear the journaling bit 
+               struct vnode *vp = p->p_fd->fd_cdir;
+               
+               /* Only root can disable journaling */
+               if (!is_suser()) {
+                       return (EPERM);
+               }
+               if (vp == NULL)
+                       return EINVAL;
 
 
-       retval = bread(hfsmp->hfs_devvp, IOBLKNOFORBLK(kMasterDirectoryBlock, size),
-                                       IOBYTECCNTFORBLK(kMasterDirectoryBlock, kMDBSize, size), NOCRED, &bp);
+               hfsmp = VTOHFS(vp);
+
+               printf("hfs: disabling journaling for mount @ 0x%x\n", vnode_mount(vp));
+
+               hfs_global_exclusive_lock_acquire(hfsmp);
+
+               // Lights out for you buddy!
+               journal_close(hfsmp->jnl);
+               hfsmp->jnl = NULL;
+
+               if (hfsmp->jvp && hfsmp->jvp != hfsmp->hfs_devvp) {
+                       VNOP_CLOSE(hfsmp->jvp, hfsmp->hfs_flags & HFS_READ_ONLY ? FREAD : FREAD|FWRITE, context);
+               }
+               hfsmp->jvp = NULL;
+               vfs_clearflags(hfsmp->hfs_mp, (uint64_t)((unsigned int)MNT_JOURNALED));
+               hfsmp->jnl_start        = 0;
+               hfsmp->hfs_jnlinfoblkid = 0;
+               hfsmp->hfs_jnlfileid    = 0;
+               
+               HFSTOVCB(hfsmp)->vcbAtrb &= ~kHFSVolumeJournaledMask;
+               
+               hfs_global_exclusive_lock_release(hfsmp);
+               hfs_flushvolumeheader(hfsmp, MNT_WAIT, 1);
+
+               return 0;
+       } else if (name[0] == HFS_GET_JOURNAL_INFO) {
+               struct vnode *vp = p->p_fd->fd_cdir;
+               off_t jnl_start, jnl_size;
+
+               if (vp == NULL)
+                       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;
+           }
+
+           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;
+       
+       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));;
+       };
+
+       return (ENOTSUP);
+}
+
+
+static int
+hfs_vfs_vget(struct mount *mp, ino64_t ino, struct vnode **vpp, __unused vfs_context_t context)
+{
+       return hfs_vget(VFSTOHFS(mp), (cnid_t)ino, vpp, 1);
+}
+
+
+/*
+ * 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 = NULL;
+       struct cat_desc cndesc;
+       struct cat_attr cnattr;
+       struct cat_fork cnfork;
+       struct componentname cn;
+       int error;
+       
+       /* 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 == hfsmp->hfs_privdir_desc.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 = &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_nlink = 2;
+               cnattr.ca_entries = 1;
+               cnattr.ca_mode = (S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO);
+       } else {
+               int lockflags;
+
+               lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+               error = cat_idlookup(hfsmp, cnid, &cndesc, &cnattr, &cnfork);
+               hfs_systemfile_unlock(hfsmp, lockflags);
+
+               if (error) {
+                       *vpp = NULL;
+                       return (error);
+               }
+
+               /* Hide open files that have been deleted */
+               if ((hfsmp->hfs_privdir_desc.cd_cnid != 0) &&
+                   (cndesc.cd_parentcnid == hfsmp->hfs_privdir_desc.cd_cnid)) {
+                   // XXXdbg - if this is a hardlink, we could call
+                   //          hfs_chash_snoop() to see if there is
+                   //          already a cnode and vnode present for
+                   //          this fileid.  however I'd rather not
+                   //          risk it at this point in Tiger.
+                       cat_releasedesc(&cndesc);
+                       error = ENOENT;
+                       *vpp = NULL;
+                       return (error);
+               }
+       }
+
+       /*
+        * 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);
+
+       /* XXX should we supply the parent as well... ? */
+       error = hfs_getnewvnode(hfsmp, NULLVP, &cn, &cndesc, 0, &cnattr, &cnfork, &vp);
+       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
+hfs_flushfiles(struct mount *mp, int flags, struct proc *p)
+{
+       struct hfsmount *hfsmp;
+       struct vnode *skipvp = NULLVP;
+       int quotafilecnt;
+       int i;
+       int error;
+
+       hfsmp = VFSTOHFS(mp);
+
+#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);
+               }
+               error = vflush(mp, NULLVP, SKIPSYSTEM | flags);
+       }
+#endif /* QUOTA */
+
+       return (error);
+}
+
+/*
+ * Update volume encoding bitmap (HFS Plus only)
+ */
+__private_extern__
+void
+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;
+
+       switch (encoding) {
+       case kTextEncodingMacUkrainian:
+               index = kIndexMacUkrainian;
+               break;
+       case kTextEncodingMacFarsi:
+               index = kIndexMacFarsi;
+               break;
+       default:
+               index = encoding;
+               break;
+       }
+
+       if (index < 64) {
+               HFS_MOUNT_LOCK(hfsmp, TRUE)
+               hfsmp->encodingsBitmap |= (u_int64_t)(1ULL << index);
+               hfsmp->vcbFlags |= 0xFF00;
+               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)
+{
+       struct timeval tv;
+
+       microtime(&tv);
+
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+
+       hfsmp->vcbFlags |= 0xFF00;
+       hfsmp->hfs_mtime = tv.tv_sec;
+
+       switch (op) {
+       case VOL_UPDATE:
+               break;
+       case VOL_MKDIR:
+               if (hfsmp->hfs_dircount != 0xFFFFFFFF)
+                       ++hfsmp->hfs_dircount;
+               if (inroot && hfsmp->vcbNmRtDirs != 0xFFFF)
+                       ++hfsmp->vcbNmRtDirs;
+               break;
+       case VOL_RMDIR:
+               if (hfsmp->hfs_dircount != 0)
+                       --hfsmp->hfs_dircount;
+               if (inroot && hfsmp->vcbNmRtDirs != 0xFFFF)
+                       --hfsmp->vcbNmRtDirs;
+               break;
+       case VOL_MKFILE:
+               if (hfsmp->hfs_filecount != 0xFFFFFFFF)
+                       ++hfsmp->hfs_filecount;
+               if (inroot && hfsmp->vcbNmFls != 0xFFFF)
+                       ++hfsmp->vcbNmFls;
+               break;
+       case VOL_RMFILE:
+               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);
+       }
+
+       return (0);
+}
+
+
+static int
+hfs_flushMDB(struct hfsmount *hfsmp, int waitfor, int altflush)
+{
+       ExtendedVCB *vcb = HFSTOVCB(hfsmp);
+       struct filefork *fp;
+       HFSMasterDirectoryBlock *mdb;
+       struct buf *bp = NULL;
+       int retval;
+       int sectorsize;
+       ByteCount namelen;
+
+       sectorsize = hfsmp->hfs_phys_block_size;
+       retval = (int)buf_bread(hfsmp->hfs_devvp, (daddr64_t)HFS_PRI_SECTOR(sectorsize), sectorsize, NOCRED, &bp);
        if (retval) {
        if (retval) {
-           DBG_VFS((" hfs_flushMDB bread return error! (%d)\n", retval));
-               if (bp) brelse(bp);
+               if (bp)
+                       buf_brelse(bp);
                return retval;
        }
 
                return retval;
        }
 
-    DBG_ASSERT(bp != NULL);
-    DBG_ASSERT(bp->b_data != NULL);
-    DBG_ASSERT(bp->b_bcount == size);
+       lck_mtx_lock(&hfsmp->hfs_mutex);
 
 
-       mdb = (HFSMasterDirectoryBlock *)((char *)bp->b_data + IOBYTEOFFSETFORBLK(kMasterDirectoryBlock, size));
+       mdb = (HFSMasterDirectoryBlock *)(buf_dataptr(bp) + HFS_PRI_OFFSET(sectorsize));
     
     
-       VCB_LOCK(vcb);
-       mdb->drCrDate   = SWAP_BE32 (UTCToLocal(vcb->vcbCrDate));
-       mdb->drLsMod    = SWAP_BE32 (UTCToLocal(vcb->vcbLsMod));
-       mdb->drAtrb             = SWAP_BE16 (vcb->vcbAtrb);
+       mdb->drCrDate   = SWAP_BE32 (UTCToLocal(to_hfs_time(vcb->vcbCrDate)));
+       mdb->drLsMod    = SWAP_BE32 (UTCToLocal(to_hfs_time(vcb->vcbLsMod)));
+       mdb->drAtrb     = SWAP_BE16 (vcb->vcbAtrb);
        mdb->drNmFls    = SWAP_BE16 (vcb->vcbNmFls);
        mdb->drAllocPtr = SWAP_BE16 (vcb->nextAllocation);
        mdb->drClpSiz   = SWAP_BE32 (vcb->vcbClpSiz);
        mdb->drNmFls    = SWAP_BE16 (vcb->vcbNmFls);
        mdb->drAllocPtr = SWAP_BE16 (vcb->nextAllocation);
        mdb->drClpSiz   = SWAP_BE32 (vcb->vcbClpSiz);
@@ -1791,7 +2453,7 @@ short hfs_flushMDB(struct hfsmount *hfsmp, int waitfor)
        if (retval)
                retval = utf8_to_mac_roman(namelen, vcb->vcbVN, mdb->drVN);
        
        if (retval)
                retval = utf8_to_mac_roman(namelen, vcb->vcbVN, mdb->drVN);
        
-       mdb->drVolBkUp  = SWAP_BE32 (UTCToLocal(vcb->vcbVolBkUp));
+       mdb->drVolBkUp  = SWAP_BE32 (UTCToLocal(to_hfs_time(vcb->vcbVolBkUp)));
        mdb->drWrCnt    = SWAP_BE32 (vcb->vcbWrCnt);
        mdb->drNmRtDirs = SWAP_BE16 (vcb->vcbNmRtDirs);
        mdb->drFilCnt   = SWAP_BE32 (vcb->vcbFilCnt);
        mdb->drWrCnt    = SWAP_BE32 (vcb->vcbWrCnt);
        mdb->drNmRtDirs = SWAP_BE16 (vcb->vcbNmRtDirs);
        mdb->drFilCnt   = SWAP_BE32 (vcb->vcbFilCnt);
@@ -1799,188 +2461,1150 @@ short hfs_flushMDB(struct hfsmount *hfsmp, int waitfor)
        
        bcopy(vcb->vcbFndrInfo, mdb->drFndrInfo, sizeof(mdb->drFndrInfo));
 
        
        bcopy(vcb->vcbFndrInfo, mdb->drFndrInfo, sizeof(mdb->drFndrInfo));
 
-       fcb = VTOFCB(vcb->extentsRefNum);
-       /* HFSPlusToHFSExtents(fcb->fcbExtents, mdb->drXTExtRec); */
-       mdb->drXTExtRec[0].startBlock = SWAP_BE16 (fcb->fcbExtents[0].startBlock);
-       mdb->drXTExtRec[0].blockCount = SWAP_BE16 (fcb->fcbExtents[0].blockCount);
-       mdb->drXTExtRec[1].startBlock = SWAP_BE16 (fcb->fcbExtents[1].startBlock);
-       mdb->drXTExtRec[1].blockCount = SWAP_BE16 (fcb->fcbExtents[1].blockCount);
-       mdb->drXTExtRec[2].startBlock = SWAP_BE16 (fcb->fcbExtents[2].startBlock);
-       mdb->drXTExtRec[2].blockCount = SWAP_BE16 (fcb->fcbExtents[2].blockCount);
-    
-       mdb->drXTFlSize = SWAP_BE32 (fcb->fcbPLen);
-       mdb->drXTClpSiz = SWAP_BE32 (fcb->fcbClmpSize);
+       fp = VTOF(vcb->extentsRefNum);
+       mdb->drXTExtRec[0].startBlock = SWAP_BE16 (fp->ff_extents[0].startBlock);
+       mdb->drXTExtRec[0].blockCount = SWAP_BE16 (fp->ff_extents[0].blockCount);
+       mdb->drXTExtRec[1].startBlock = SWAP_BE16 (fp->ff_extents[1].startBlock);
+       mdb->drXTExtRec[1].blockCount = SWAP_BE16 (fp->ff_extents[1].blockCount);
+       mdb->drXTExtRec[2].startBlock = SWAP_BE16 (fp->ff_extents[2].startBlock);
+       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;
        
        
-       fcb = VTOFCB(vcb->catalogRefNum);
-       /* HFSPlusToHFSExtents(fcb->fcbExtents, mdb->drCTExtRec); */
-       mdb->drCTExtRec[0].startBlock = SWAP_BE16 (fcb->fcbExtents[0].startBlock);
-       mdb->drCTExtRec[0].blockCount = SWAP_BE16 (fcb->fcbExtents[0].blockCount);
-       mdb->drCTExtRec[1].startBlock = SWAP_BE16 (fcb->fcbExtents[1].startBlock);
-       mdb->drCTExtRec[1].blockCount = SWAP_BE16 (fcb->fcbExtents[1].blockCount);
-       mdb->drCTExtRec[2].startBlock = SWAP_BE16 (fcb->fcbExtents[2].startBlock);
-       mdb->drCTExtRec[2].blockCount = SWAP_BE16 (fcb->fcbExtents[2].blockCount);
-    
-       mdb->drCTFlSize = SWAP_BE32 (fcb->fcbPLen);
-       mdb->drCTClpSiz = SWAP_BE32 (fcb->fcbClmpSize);
-       VCB_UNLOCK(vcb);
-
-    if (waitfor != MNT_WAIT)
-               bawrite(bp);
-    else 
-               retval = VOP_BWRITE(bp);
+       fp = VTOF(vcb->catalogRefNum);
+       mdb->drCTExtRec[0].startBlock = SWAP_BE16 (fp->ff_extents[0].startBlock);
+       mdb->drCTExtRec[0].blockCount = SWAP_BE16 (fp->ff_extents[0].blockCount);
+       mdb->drCTExtRec[1].startBlock = SWAP_BE16 (fp->ff_extents[1].startBlock);
+       mdb->drCTExtRec[1].blockCount = SWAP_BE16 (fp->ff_extents[1].blockCount);
+       mdb->drCTExtRec[2].startBlock = SWAP_BE16 (fp->ff_extents[2].startBlock);
+       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 );
 
        MarkVCBClean( vcb );
 
+       lck_mtx_unlock(&hfsmp->hfs_mutex);
+
+       /* If requested, flush out the alternate MDB */
+       if (altflush) {
+               struct buf *alt_bp = NULL;
+
+               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);
+
+                       (void) VNOP_BWRITE(alt_bp);
+               } else if (alt_bp)
+                       buf_brelse(alt_bp);
+       }
+
+       if (waitfor != MNT_WAIT)
+               buf_bawrite(bp);
+       else 
+               retval = VNOP_BWRITE(bp);
+
        return (retval);
 }
 
        return (retval);
 }
 
-
-short hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor)
+/*
+ *  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)
 {
 {
-    ExtendedVCB                        *vcb = HFSTOVCB(hfsmp);
-    FCB                                                *fcb;
-    HFSPlusVolumeHeader                *volumeHeader;
-    int                                                retval;
-    struct buf                                 *bp;
-    int                                                i;
+       ExtendedVCB *vcb = HFSTOVCB(hfsmp);
+       struct filefork *fp;
+       HFSPlusVolumeHeader *volumeHeader;
+       int retval;
+       struct buf *bp;
+       int i;
        int sectorsize;
        int sectorsize;
-       int priIDSector;
+       daddr64_t priIDSector;
+       int critical = 0;
+       u_int16_t  signature;
+       u_int16_t  hfsversion;
 
 
-       if (vcb->vcbSigWord != kHFSPlusSigWord)
-               return EINVAL;
+       if (hfsmp->hfs_flags & HFS_READ_ONLY) {
+               return(0);
+       }
+       if (vcb->vcbSigWord == kHFSSigWord)
+               return hfs_flushMDB(hfsmp, waitfor, altflush);
 
 
+       if (altflush)
+               critical = 1;
        sectorsize = hfsmp->hfs_phys_block_size;
        sectorsize = hfsmp->hfs_phys_block_size;
-       priIDSector = (vcb->hfsPlusIOPosOffset / sectorsize) +
-                       HFS_PRI_SECTOR(sectorsize);
+       priIDSector = (daddr64_t)((vcb->hfsPlusIOPosOffset / sectorsize) +
+                                 HFS_PRI_SECTOR(sectorsize));
 
 
-       retval = meta_bread(hfsmp->hfs_devvp, priIDSector, sectorsize, NOCRED, &bp);
+       if (hfs_start_transaction(hfsmp) != 0) {
+           return EINVAL;
+       }
+
+       retval = (int)buf_meta_bread(hfsmp->hfs_devvp, priIDSector, sectorsize, NOCRED, &bp);
        if (retval) {
        if (retval) {
-           DBG_VFS((" hfs_flushvolumeheader bread return error! (%d)\n", retval));
-               if (bp) brelse(bp);
-               return retval;
+               if (bp)
+                       buf_brelse(bp);
+
+               hfs_end_transaction(hfsmp);
+
+               printf("HFS: err %d reading VH blk (%s)\n", retval, vcb->vcbVN);
+               return (retval);
        }
 
        }
 
-    DBG_ASSERT(bp != NULL);
-    DBG_ASSERT(bp->b_data != NULL);
-    DBG_ASSERT(bp->b_bcount == size);
+       if (hfsmp->jnl) {
+               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
         * (ie from a setattrlist call)
         */
 
        /*
         * For embedded HFS+ volumes, update create date if it changed
         * (ie from a setattrlist call)
         */
-       if ((vcb->hfsPlusIOPosOffset != 0) && (SWAP_BE32 (volumeHeader->createDate) != vcb->localCreateDate))
-         {
-               struct buf                              *bp2;
+       if ((vcb->hfsPlusIOPosOffset != 0) &&
+           (SWAP_BE32 (volumeHeader->createDate) != vcb->localCreateDate)) {
+               struct buf *bp2;
                HFSMasterDirectoryBlock *mdb;
 
                HFSMasterDirectoryBlock *mdb;
 
-               retval = meta_bread(hfsmp->hfs_devvp, HFS_PRI_SECTOR(sectorsize), sectorsize, NOCRED, &bp2);
-               if (retval != E_NONE) {
-                       if (bp2) brelse(bp2);
+               retval = (int)buf_meta_bread(hfsmp->hfs_devvp, (daddr64_t)HFS_PRI_SECTOR(sectorsize),
+                               sectorsize, NOCRED, &bp2);
+               if (retval) {
+                       if (bp2)
+                               buf_brelse(bp2);
+                       retval = 0;
                } else {
                } else {
-                       mdb = (HFSMasterDirectoryBlock *)(bp2->b_data + HFS_PRI_OFFSET(sectorsize));
+                       mdb = (HFSMasterDirectoryBlock *)(buf_dataptr(bp2) +
+                               HFS_PRI_OFFSET(sectorsize));
 
                        if ( SWAP_BE32 (mdb->drCrDate) != vcb->localCreateDate )
                          {
 
                        if ( SWAP_BE32 (mdb->drCrDate) != vcb->localCreateDate )
                          {
+                               if (hfsmp->jnl) {
+                                   journal_modify_block_start(hfsmp->jnl, bp2);
+                               }
+
                                mdb->drCrDate = SWAP_BE32 (vcb->localCreateDate);       /* pick up the new create date */
 
                                mdb->drCrDate = SWAP_BE32 (vcb->localCreateDate);       /* pick up the new create date */
 
-                               (void) VOP_BWRITE(bp2);         /* write out the changes */
+                               if (hfsmp->jnl) {
+                                       journal_modify_block_end(hfsmp->jnl, bp2);
+                               } else {
+                                       (void) VNOP_BWRITE(bp2);                /* write out the changes */
+                               }
                          }
                        else
                          {
                          }
                        else
                          {
-                               brelse(bp2);                                            /* just release it */
+                               buf_brelse(bp2);                                                /* just release it */
                          }
                  }     
                          }
                  }     
-         }
+       }
+
+       if (1 /* hfsmp->jnl == 0 */) {
+               lck_mtx_lock(&hfsmp->hfs_mutex);
+       }
 
 
-       VCB_LOCK(vcb);
        /* Note: only update the lower 16 bits worth of attributes */
        /* Note: only update the lower 16 bits worth of attributes */
-       volumeHeader->attributes                 =      SWAP_BE32 ((SWAP_BE32 (volumeHeader->attributes) & 0xFFFF0000) + (UInt16) vcb->vcbAtrb);
-       volumeHeader->lastMountedVersion =  SWAP_BE32 (kHFSPlusMountVersion);
-       volumeHeader->createDate                 =  SWAP_BE32 (vcb->localCreateDate);  /* volume create date is in local time */
-       volumeHeader->modifyDate                 =  SWAP_BE32 (vcb->vcbLsMod);
-       volumeHeader->backupDate                 =  SWAP_BE32 (vcb->vcbVolBkUp);
-       volumeHeader->checkedDate                =  SWAP_BE32 (vcb->checkedDate);
-       volumeHeader->fileCount                  =      SWAP_BE32 (vcb->vcbFilCnt);
-       volumeHeader->folderCount                =      SWAP_BE32 (vcb->vcbDirCnt);
-       volumeHeader->freeBlocks                 =      SWAP_BE32 (vcb->freeBlocks);
-       volumeHeader->nextAllocation     =      SWAP_BE32 (vcb->nextAllocation);
-       volumeHeader->rsrcClumpSize              =      SWAP_BE32 (vcb->vcbClpSiz);
-       volumeHeader->dataClumpSize              =      SWAP_BE32 (vcb->vcbClpSiz);
-       volumeHeader->nextCatalogID              =      SWAP_BE32 (vcb->vcbNxtCNID);
-       volumeHeader->writeCount                 =      SWAP_BE32 (vcb->vcbWrCnt);
-       volumeHeader->encodingsBitmap    =      SWAP_BE64 (vcb->encodingsBitmap);
-
-       bcopy( vcb->vcbFndrInfo, volumeHeader->finderInfo, sizeof(volumeHeader->finderInfo) );
-
-       VCB_UNLOCK(vcb);
-
-       fcb = VTOFCB(vcb->extentsRefNum);
-       /* bcopy( fcb->fcbExtents, volumeHeader->extentsFile.extents, sizeof(HFSPlusExtentRecord) ); */
-    for (i = 0; i < kHFSPlusExtentDensity; i++) {
-        volumeHeader->extentsFile.extents[i].startBlock        = SWAP_BE32 (fcb->fcbExtents[i].startBlock);
-        volumeHeader->extentsFile.extents[i].blockCount        = SWAP_BE32 (fcb->fcbExtents[i].blockCount);
-    }
-    
-       fcb->fcbFlags &= ~fcbModifiedMask;
-       volumeHeader->extentsFile.logicalSize = SWAP_BE64 (fcb->fcbEOF);
-       volumeHeader->extentsFile.totalBlocks = SWAP_BE32 (fcb->fcbPLen / vcb->blockSize);
-       volumeHeader->extentsFile.clumpSize   = SWAP_BE32 (fcb->fcbClmpSize);
-
-       fcb = VTOFCB(vcb->catalogRefNum);
-       /* bcopy( fcb->fcbExtents, volumeHeader->catalogFile.extents, sizeof(HFSPlusExtentRecord) ); */
-    for (i = 0; i < kHFSPlusExtentDensity; i++) {
-        volumeHeader->catalogFile.extents[i].startBlock        = SWAP_BE32 (fcb->fcbExtents[i].startBlock);
-        volumeHeader->catalogFile.extents[i].blockCount        = SWAP_BE32 (fcb->fcbExtents[i].blockCount);
-    }
-    
-       fcb->fcbFlags &= ~fcbModifiedMask;
-       volumeHeader->catalogFile.logicalSize = SWAP_BE64 (fcb->fcbEOF);
-       volumeHeader->catalogFile.totalBlocks = SWAP_BE32 (fcb->fcbPLen / vcb->blockSize);
-       volumeHeader->catalogFile.clumpSize   = SWAP_BE32 (fcb->fcbClmpSize);
-
-       fcb = VTOFCB(vcb->allocationsRefNum);
-       /* bcopy( fcb->fcbExtents, volumeHeader->allocationFile.extents, sizeof(HFSPlusExtentRecord) ); */
-    for (i = 0; i < kHFSPlusExtentDensity; i++) {
-        volumeHeader->allocationFile.extents[i].startBlock     = SWAP_BE32 (fcb->fcbExtents[i].startBlock);
-        volumeHeader->allocationFile.extents[i].blockCount     = SWAP_BE32 (fcb->fcbExtents[i].blockCount);
-    }
-    
-       fcb->fcbFlags &= ~fcbModifiedMask;
-       volumeHeader->allocationFile.logicalSize = SWAP_BE64 (fcb->fcbEOF);
-       volumeHeader->allocationFile.totalBlocks = SWAP_BE32 (fcb->fcbPLen / vcb->blockSize);
-       volumeHeader->allocationFile.clumpSize   = SWAP_BE32 (fcb->fcbClmpSize);
-
-    if (waitfor != MNT_WAIT)
-        bawrite(bp);
-    else 
-               retval = VOP_BWRITE(bp);
-       MarkVCBClean( vcb );
+       volumeHeader->attributes       = SWAP_BE32 (vcb->vcbAtrb);
+       volumeHeader->journalInfoBlock = SWAP_BE32 (vcb->vcbJinfoBlock);
+       if (hfsmp->jnl) {
+               volumeHeader->lastMountedVersion = SWAP_BE32 (kHFSJMountVersion);
+       } else {
+               volumeHeader->lastMountedVersion = SWAP_BE32 (kHFSPlusMountVersion);
+       }
+       volumeHeader->createDate        = SWAP_BE32 (vcb->localCreateDate);  /* volume create date is in local time */
+       volumeHeader->modifyDate        = SWAP_BE32 (to_hfs_time(vcb->vcbLsMod));
+       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);
+       volumeHeader->dataClumpSize     = SWAP_BE32 (vcb->vcbClpSiz);
+       volumeHeader->nextCatalogID     = SWAP_BE32 (vcb->vcbNxtCNID);
+       volumeHeader->writeCount        = SWAP_BE32 (vcb->vcbWrCnt);
+       volumeHeader->encodingsBitmap   = SWAP_BE64 (vcb->encodingsBitmap);
+
+       if (bcmp(vcb->vcbFndrInfo, volumeHeader->finderInfo, sizeof(volumeHeader->finderInfo)) != 0) {
+               bcopy(vcb->vcbFndrInfo, volumeHeader->finderInfo, sizeof(volumeHeader->finderInfo));
+               critical = 1;
+       }
+
+       /* Sync Extents over-flow file meta data */
+       fp = VTOF(vcb->extentsRefNum);
+       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;
+       }
+
+       /* Sync Catalog file meta data */
+       fp = VTOF(vcb->catalogRefNum);
+       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;
+       }
+
+       /* Sync Allocation file meta data */
+       fp = VTOF(vcb->allocationsRefNum);
+       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);
+       }
+
+       vcb->vcbFlags &= 0x00FF;
 
 
+       if (1 /* hfsmp->jnl == 0 */) {
+               lck_mtx_unlock(&hfsmp->hfs_mutex);
+       }
+
+       /* If requested, flush out the alternate volume header */
+       if (altflush && hfsmp->hfs_alt_id_sector) {
+               struct buf *alt_bp = NULL;
+
+               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, (char *)buf_dataptr(alt_bp) + HFS_ALT_OFFSET(sectorsize), kMDBSize);
+
+                       if (hfsmp->jnl) {
+                               journal_modify_block_end(hfsmp->jnl, alt_bp);
+                       } else {
+                               (void) VNOP_BWRITE(alt_bp);
+                       }
+               } else if (alt_bp)
+                       buf_brelse(alt_bp);
+       }
+
+       if (hfsmp->jnl) {
+               journal_modify_block_end(hfsmp->jnl, bp);
+       } else {
+               if (waitfor != MNT_WAIT)
+                       buf_bawrite(bp);
+               else {
+                   retval = VNOP_BWRITE(bp);
+                   /* When critical data changes, flush the device cache */
+                   if (critical && (retval == 0)) {
+                       (void) VNOP_IOCTL(hfsmp->hfs_devvp, DKIOCSYNCHRONIZECACHE,
+                                        NULL, FWRITE, NULL);
+                   }
+               }
+       }
+       hfs_end_transaction(hfsmp);
        return (retval);
 }
 
 
 /*
        return (retval);
 }
 
 
 /*
- *      Moved here to avoid having to define prototypes
+ * 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;
+
+       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);
+       }
+
+       lockflags = hfs_systemfile_lock(hfsmp, 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.
+        */
+       bitmapblks = roundup(newblkcnt / 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;
+
+               /*
+                * Add a new extent to the allocation bitmap file.
+                */
+               error = AddFileExtent(vcb, fp, vcb->totalBlocks, bitmapblks);
+               if (error) {
+                       printf("hfs_extendfs: error %d adding extents\n", error);
+                       goto out;
+               }
+               blkcnt = bitmapblks;
+               blkno  = (daddr64_t)fp->ff_blocks;
+               fp->ff_blocks += bitmapblks;
+               fp->ff_size += (u_int64_t)bitmapblks * (u_int64_t)vcb->blockSize;
+               VTOC(vp)->c_blocks = fp->ff_blocks;
+               /*
+                * Zero out the new bitmap blocks.
+                */
+               {
+       
+                       bp = NULL;
+                       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.
+                */
+               error = BlockMarkAllocated(vcb, vcb->totalBlocks, bitmapblks);
+               if (error) {
+                       printf("hfs_extendfs: error %d setting bitmap\n", error);
+                       goto out;
+               }
+       }
+       /*
+        * 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 - bitmapblks;
+       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.
+                */
+               fp->ff_size -= (u_int64_t)bitmapblks * (u_int64_t)vcb->blockSize;
+               vcb->totalBlocks -= addblks;
+               vcb->freeBlocks -= addblks - bitmapblks;
+               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);
+               } else if (bp) {
+                       buf_brelse(bp);
+               }
+       }
+out:
+       if (error && fp) {
+               /* Restore allocation fork. */
+               bcopy(&forkdata, &fp->ff_data, sizeof(forkdata));
+               VTOC(vp)->c_blocks = fp->ff_blocks;
+
+       }
+       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, __unused vfs_context_t context)
+{
+       struct vnode* rvp = NULL;
+       struct  buf *bp = NULL;
+       u_int64_t oldsize;
+       u_int32_t newblkcnt;
+       u_int32_t reclaimblks;
+       int lockflags = 0;
+       int transaction_begun = 0;
+       int error;
+
+       /*
+        * Grab the root vnode to serialize with another hfs_truncatefs call.
+        */
+       error = hfs_vget(hfsmp, kHFSRootFolderID, &rvp, 0);
+       if (error) {
+               return (error);
+       }
+       /*
+        * - HFS Plus file systems only. 
+        * - Journaling must be enabled.
+        * - No embedded volumes.
+        */
+       if ((hfsmp->hfs_flags & HFS_STANDARD) ||
+           (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 > (hfsmp->freeBlocks / 4)) {
+               error = ENOSPC;
+               goto out;
+       }
+
+       printf("hfs_truncatefs: shrinking %s by %d blocks out of %d\n",
+              hfsmp->vcbVN, reclaimblks, hfsmp->totalBlocks);
+
+       if (hfs_start_transaction(hfsmp) != 0) {
+               error = EINVAL;
+               goto out;
+       }
+       transaction_begun = 1;
+
+       /*
+        * Look for files that have blocks beyond newblkcnt.
+        */
+       if (hfs_isallocated(hfsmp, newblkcnt, reclaimblks - 1)) {
+               /*
+                * 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, newblkcnt) != 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, newblkcnt, reclaimblks - 1)) {
+                       printf("hfs_truncatefs: didn't reclaim enough space on %s\n", hfsmp->vcbVN);
+                       error = ENOSPC;
+                       goto out;
+               }
+       }
+       lockflags = hfs_systemfile_lock(hfsmp, 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 block for alternate volume header.
+        */
+       if (hfsmp->blockSize == 512)
+               error = BlockMarkAllocated(hfsmp, newblkcnt - 2, 2);
+       else
+               error = BlockMarkAllocated(hfsmp, newblkcnt - 1, 1);
+
+       if (error) {
+               goto out;
+       }
+
+       /*
+        * Invalidate the existing alternate volume header.
+        */
+       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) {
+                       journal_modify_block_start(hfsmp->jnl, bp);
+       
+                       bzero((void*)((char *)buf_dataptr(bp) + HFS_ALT_OFFSET(hfsmp->hfs_phys_block_size)), kMDBSize);
+       
+                       journal_modify_block_end(hfsmp->jnl, bp);
+               } else if (bp) {
+                       buf_brelse(bp);
+               }
+               bp = NULL;
+       }
+
+       /*
+        * Adjust file system variables and flush them to disk.
+        */
+       hfsmp->freeBlocks -= hfsmp->totalBlocks - newblkcnt;
+       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);
+out:
+       if (lockflags) {
+               hfs_systemfile_unlock(hfsmp, lockflags);
+       }
+       if (transaction_begun) {
+               hfs_end_transaction(hfsmp);
+       }
+       if (rvp) {
+               hfs_unlock(VTOC(rvp));
+               vnode_put(rvp);
+       }
+       return (error);
+}
+
+/*
+ * Reclaim space at the end of a file system.
+ */
+static int
+hfs_reclaimspace(struct hfsmount *hfsmp, u_long startblk)
+{
+       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;
+       int maxfilecnt;
+       u_long block;
+       int lockflags;
+       int i;
+       int error;
+
+       /* 
+        * Check if Attributes file overlaps.
+        */
+       if (hfsmp->hfs_attribute_vp) {
+               struct filefork *fp;
+       
+               fp = VTOF(hfsmp->hfs_attribute_vp);
+               for (i = 0; i < kHFSPlusExtentDensity; ++i) {
+                       block = fp->ff_extents[i].startBlock +
+                               fp->ff_extents[i].blockCount;
+                       if (block >= startblk) {
+                               printf("hfs_reclaimspace: Attributes file can't move\n");
+                               return (EPERM);
+                       }
+               }
+       }
+
+       /* For now we'll move a maximum of 16,384 files. */
+       maxfilecnt = MIN(hfsmp->hfs_filecount, 16384);
+       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;
+       hfsmp->nextAllocation = 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 file locked during iteration. */
+       lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+       error = BTIterateRecord(fcb, kBTreeFirstRecord, iterator, NULL, NULL);
+       if (error) {
+               hfs_systemfile_unlock(hfsmp, lockflags);
+               goto out;
+       }
+
+       /*
+        * 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 == btNotFound)
+                               error = 0;
+                       break;
+               }
+               if (filerec.recordType != kHFSPlusFileRecord ||
+                   filerec.fileID == hfsmp->hfs_jnlfileid)
+                       continue;
+               /* 
+                * Check if either fork overlaps target space.
+                */
+               for (i = 0; i < kHFSPlusExtentDensity; ++i) {
+                       block = filerec.dataFork.extents[i].startBlock +
+                               filerec.dataFork.extents[i].blockCount;
+                       if (block >= startblk) {
+                               if (filerec.fileID == hfsmp->hfs_jnlfileid) {
+                                       printf("hfs_reclaimspace: cannot move active journal\n");
+                                       error = EPERM;
+                                       break;
+                               }
+                               cnidbufp[filecnt++] = filerec.fileID;
+                               break;
+                       }
+                       block = filerec.resourceFork.extents[i].startBlock +
+                               filerec.resourceFork.extents[i].blockCount;
+                       if (block >= startblk) {
+                               cnidbufp[filecnt++] = filerec.fileID;
+                               break;
+                       }
+               }
+       }
+       /* All done with catalog. */
+       hfs_systemfile_unlock(hfsmp, lockflags);
+       if (error)
+               goto out;
+
+       /* 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());
+               }
+               hfs_unlock(VTOC(vp));
+               if (error) 
+                       break;
+
+               /* Relocate any resource fork blocks. */
+               if ((VTOC((vp))->c_blocks - VTOF((vp))->ff_blocks) > 0) {
+                       error = hfs_vgetrsrc(hfsmp, vp, &rvp, current_proc());
+                       if (error)
+                               break;
+                       hfs_lock(VTOC(rvp), HFS_EXCLUSIVE_LOCK);
+                       error = hfs_relocate(rvp, hfsmp->hfs_metazone_end + 1, kauth_cred_get(), current_proc());
+                       hfs_unlock(VTOC(rvp));
+                       vnode_put(rvp);
+                       if (error)
+                               break;
+               }
+               vnode_put(vp);
+               vp = NULL;
+       }
+       if (vp) {
+               vnode_put(vp);
+               vp = NULL;
+       }
+
+       /*
+        * Note: this implementation doesn't handle overflow extents.
+        */
+out:
+       kmem_free(kernel_map, (vm_offset_t)iterator, sizeof(*iterator));
+       kmem_free(kernel_map, (vm_offset_t)cnidbufp, cnidbufsize);
+
+       /* On errors restore the roving allocation pointer. */
+       if (error) {
+               hfsmp->nextAllocation = saved_next_allocation;
+       }
+       return (error);
+}
+
+
+/*
+ * Get file system attributes.
+ */
+static int
+hfs_vfs_getattr(struct mount *mp, struct vfs_attr *fsap, __unused vfs_context_t context)
+{
+       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, (uint64_t)hfsmp->vcbFilCnt + (uint64_t)hfsmp->vcbDirCnt);
+       VFSATTR_RETURN(fsap, f_filecount, (uint64_t)hfsmp->vcbFilCnt);
+       VFSATTR_RETURN(fsap, f_dircount, (uint64_t)hfsmp->vcbDirCnt);
+       VFSATTR_RETURN(fsap, f_maxobjcount, (uint64_t)0xFFFFFFFF);
+       VFSATTR_RETURN(fsap, f_iosize, (size_t)(MAX_UPL_TRANSFER * PAGE_SIZE));
+       VFSATTR_RETURN(fsap, f_blocks, (uint64_t)hfsmp->totalBlocks);
+       VFSATTR_RETURN(fsap, f_bfree, (uint64_t)hfs_freeblks(hfsmp, 0));
+       VFSATTR_RETURN(fsap, f_bavail, (uint64_t)hfs_freeblks(hfsmp, 1));
+       VFSATTR_RETURN(fsap, f_bsize, (uint32_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, (uint64_t)(hfsmp->totalBlocks - 2));
+       VFSATTR_RETURN(fsap, f_ffree, MIN((uint64_t)freeCNIDs, (uint64_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;
+               } else {
+                       cap->capabilities[VOL_CAPABILITIES_FORMAT] =
+                               VOL_CAP_FMT_PERSISTENTOBJECTIDS |
+                               VOL_CAP_FMT_SYMBOLICLINKS |
+                               VOL_CAP_FMT_HARDLINKS |
+                               VOL_CAP_FMT_JOURNAL |
+                               (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;
+               }
+               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;
+               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;
+               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;
+               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 = ATTR_CMN_VALIDMASK;
+               attrp->validattr.volattr = ATTR_VOL_VALIDMASK & ~ATTR_VOL_INFO;
+               attrp->validattr.dirattr = ATTR_DIR_VALIDMASK;
+               attrp->validattr.fileattr = ATTR_FILE_VALIDMASK;
+               attrp->validattr.forkattr = 0;
+
+               attrp->nativeattr.commonattr = ATTR_CMN_VALIDMASK;
+               attrp->nativeattr.volattr = ATTR_VOL_VALIDMASK & ~ATTR_VOL_INFO;
+               attrp->nativeattr.dirattr = ATTR_DIR_VALIDMASK;
+               attrp->nativeattr.fileattr = 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)) {
+               uint16_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)) {
+               strncpy(fsap->f_vol_name, hfsmp->vcbVN, MAXPATHLEN);
+               fsap->f_vol_name[MAXPATHLEN - 1] = 0;
+               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 = 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) {
+                                       strncpy(vcb->vcbVN, name, sizeof(vcb->vcbVN));
+                                       vcb->vcbVN[sizeof(vcb->vcbVN) - 1] = 0;
+                               }
+
+                               hfs_systemfile_unlock(hfsmp, lockflags);
+                               cat_postflight(hfsmp, &cookie, p);
+                       
+                               if (error)
+                                       vcb->vcbFlags |= 0xFF00;
+                               (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) {
+                               char *name = 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(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;
+}
+
 
 /*
  * hfs vfs operations.
  */
 struct vfsops hfs_vfsops = {
 
 /*
  * hfs vfs operations.
  */
 struct vfsops hfs_vfsops = {
-    hfs_mount,
-    hfs_start,
-    hfs_unmount,
-    hfs_root,
-    hfs_quotactl,
-    hfs_statfs,
-    hfs_sync,
-    hfs_vget,
-    hfs_fhtovp,
-    hfs_vptofh,
-    hfs_init,
-    hfs_sysctl
+       hfs_mount,
+       hfs_start,
+       hfs_unmount,
+       hfs_vfs_root,
+       hfs_quotactl,
+       hfs_vfs_getattr,        /* was hfs_statfs */
+       hfs_sync,
+       hfs_vfs_vget,
+       hfs_fhtovp,
+       hfs_vptofh,
+       hfs_init,
+       hfs_sysctl,
+       hfs_vfs_setattr
 };
 };