xnu-792.10.96.tar.gz

[apple/xnu.git] / bsd / hfs / hfs.h

diff --git a/bsd/hfs/hfs.h b/bsd/hfs/hfs.h
index 1cfb21d13bcac4996080cafb4c3a091433852f76..2d34f3f8a3cf1b84ce4be3caff16fe21d0c74dfd 100644 (file)
--- a/bsd/hfs/hfs.h
+++ b/bsd/hfs/hfs.h
@@ -1,24 +1,21 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -26,18 +23,21 @@
 #ifndef __HFS__
 #define __HFS__
 
 #ifndef __HFS__
 #define __HFS__
 

+#define HFS_SPARSE_DEV 1
+

 #include <sys/appleapiopts.h>
 
 #ifdef KERNEL
 #ifdef __APPLE_API_PRIVATE
 #include <sys/param.h>
 #include <sys/appleapiopts.h>
 
 #ifdef KERNEL
 #ifdef __APPLE_API_PRIVATE
 #include <sys/param.h>

-#include <sys/lock.h>

 #include <sys/queue.h>
 #include <sys/mount.h>
 #include <sys/queue.h>
 #include <sys/mount.h>

-#include <sys/namei.h>

 #include <sys/vnode.h>
 #include <sys/quota.h>
 #include <sys/dirent.h>
 #include <sys/vnode.h>
 #include <sys/quota.h>
 #include <sys/dirent.h>

+#include <sys/event.h>
+
+#include <kern/locks.h>

 
 #include <vfs/vfs_journal.h>
 
 
 #include <vfs/vfs_journal.h>
 


@@ -46,10 +46,7 @@
 #include <hfs/hfs_cnode.h>
 #include <hfs/hfs_macos_defs.h>
 #include <hfs/hfs_encodings.h>
 #include <hfs/hfs_cnode.h>
 #include <hfs/hfs_macos_defs.h>
 #include <hfs/hfs_encodings.h>

-
-
-struct uio;            // This is more effective than #include <sys/uio.h> in case KERNEL is undefined...
-struct hfslockf;       /* For advisory locking */
+#include <hfs/hfs_hotfiles.h>

 
 /*
  *     Just reported via MIG interface.
 
 /*
  *     Just reported via MIG interface.


@@ -60,23 +57,19 @@ struct hfslockf;    /* For advisory locking */
 
 #define HFS_MAX_DEFERED_ALLOC  (1024*1024)
 
 
 #define HFS_MAX_DEFERED_ALLOC  (1024*1024)
 

+// 32 gigs is a "big" file (i.e. one that when deleted
+// would touch enough data that we should break it into
+// multiple separate transactions
+#define HFS_BIGFILE_SIZE (32LL * 1024LL * 1024LL * 1024LL)
+

 
 enum { kMDBSize = 512 };                               /* Size of I/O transfer to read entire MDB */
 
 enum { kMasterDirectoryBlock = 2 };                    /* MDB offset on disk in 512-byte blocks */
 enum { kMDBOffset = kMasterDirectoryBlock * 512 };     /* MDB offset on disk in bytes */
 
 
 enum { kMDBSize = 512 };                               /* Size of I/O transfer to read entire MDB */
 
 enum { kMasterDirectoryBlock = 2 };                    /* MDB offset on disk in 512-byte blocks */
 enum { kMDBOffset = kMasterDirectoryBlock * 512 };     /* MDB offset on disk in bytes */
 

-enum {
-       kUnknownID = 0,
-       kRootParID = 1,
-       kRootDirID = 2
-};
+#define kRootDirID kHFSRootFolderID

 
 

-enum {
-       kDataFork,
-       kRsrcFork,
-       kDirectory
-};

 
 /* number of locked buffer caches to hold for b-tree meta data */
 #define kMaxLockedMetaBuffers          32              
 
 /* number of locked buffer caches to hold for b-tree meta data */
 #define kMaxLockedMetaBuffers          32              


@@ -104,61 +97,26 @@ extern struct timezone gTimeZone;
  * superuser may continue to allocate blocks.
  */
 #define HFS_MINFREE            1
  * superuser may continue to allocate blocks.
  */
 #define HFS_MINFREE            1

-#define HFS_MAXRESERVE         (u_int64_t)(250*1024*1024)
+#define HFS_MAXRESERVE         ((u_int64_t)(250*1024*1024))

 
 

-/* Internal Data structures*/
+/*
+ * The system distinguishes between the desirable low-disk
+ * notifiaction levels for root volumes and non-root volumes.
+ * The various thresholds are computed as a fraction of the
+ * volume size, all capped at a certain fixed level
+ */
+ 
+#define HFS_ROOTLOWDISKTRIGGERFRACTION 5
+#define HFS_ROOTLOWDISKTRIGGERLEVEL ((u_int64_t)(250*1024*1024))
+#define HFS_ROOTLOWDISKSHUTOFFFRACTION 6
+#define HFS_ROOTLOWDISKSHUTOFFLEVEL ((u_int64_t)(375*1024*1024))

 
 

-struct vcb_t {
-    u_int16_t                  vcbSigWord;
-    int16_t                    vcbAtrb;
-    int16_t                    vcbFlags;
-    int16_t                    vcbspare;
-    u_int32_t                  vcbJinfoBlock;
-
-    u_int32_t                  vcbCrDate;
-    u_int32_t                  vcbLsMod;
-    u_int32_t                  vcbVolBkUp;
-
-    int32_t                    vcbFilCnt;
-    int32_t                    vcbDirCnt;
-    u_int32_t                  blockSize;      /* size of allocation blocks */
-    u_int32_t                  totalBlocks;    /* total allocation blocks */
-    u_int32_t                  freeBlocks;     /* free allocation blocks */
-    u_int32_t                  nextAllocation; /* start of next allocation search */
-    int32_t                    vcbClpSiz;
-    u_int32_t                  vcbNxtCNID;
-       u_int32_t               vcbCNIDGen;
-       int32_t                 vcbWrCnt;
-
-    int32_t                    vcbFndrInfo[8];
-
-    u_int64_t                  encodingsBitmap;        /* HFS Plus only */
-
-    u_int16_t                  vcbNmFls;               /* HFS only */
-    u_int16_t                  vcbNmRtDirs;            /* HFS only */
-    int16_t                    vcbVBMSt;               /* HFS only */
-    int16_t                    vcbAlBlSt;              /* HFS only */
-
-    struct vnode *             extentsRefNum;
-    struct vnode *             catalogRefNum;
-    struct vnode *             allocationsRefNum;
-
-    u_int8_t                   vcbVN[256];             /* volume name in UTF-8 */
-    u_int32_t                  volumeNameEncodingHint;
-    u_int32_t                  hfsPlusIOPosOffset;     /* Disk block where HFS+ starts */
-    u_int32_t                  vcbVBMIOSize;           /* volume bitmap I/O size */
-
-    /* cache of largest known free extents */
-    u_int32_t                  vcbFreeExtCnt;
-    HFSPlusExtentDescriptor vcbFreeExt[kMaxFreeExtents];
-
-    u_int32_t          reserveBlocks;          /* free block reserve */
-    u_int32_t          loanedBlocks;           /* blocks on loan for delayed allocations */
-
-    u_int32_t                  localCreateDate;        /* creation times for HFS+ volumes are in local time */
-    simple_lock_data_t vcbSimpleLock;          /* simple lock to allow concurrent access to vcb data */
-};
-typedef struct vcb_t ExtendedVCB;
+#define HFS_LOWDISKTRIGGERFRACTION 1
+#define HFS_LOWDISKTRIGGERLEVEL ((u_int64_t)(50*1024*1024))
+#define HFS_LOWDISKSHUTOFFFRACTION 2
+#define HFS_LOWDISKSHUTOFFLEVEL ((u_int64_t)(75*1024*1024))
+
+/* Internal Data structures*/

 
 
 #define kHFS_DamagedVolume  0x1        /* This volume has errors, unmount dirty */
 
 
 #define kHFS_DamagedVolume  0x1        /* This volume has errors, unmount dirty */


@@ -166,106 +124,179 @@ typedef struct vcb_t ExtendedVCB;
 /* XXX */
 #define MARK_VOLUMEDAMAGED(fcb) 
 
 /* XXX */
 #define MARK_VOLUMEDAMAGED(fcb) 
 

-/*
- * NOTE: The code relies on being able to cast an ExtendedVCB* to a vfsVCB* in order
- *      to gain access to the mount point pointer from a pointer
- *      to an ExtendedVCB.  DO NOT INSERT OTHER FIELDS BEFORE THE vcb FIELD!!
- *
- * vcbFlags, vcbLsMod, vcbFilCnt, vcbDirCnt, vcbNxtCNID, etc
- * are locked by the hfs_lock simple lock.
- */
-typedef struct vfsVCB {
-    ExtendedVCB                        vcb_vcb;
-    struct hfsmount            *vcb_hfsmp;                             /* Pointer to hfsmount structure */
-} vfsVCB_t;
-
-

 
 /* This structure describes the HFS specific mount structure data. */
 typedef struct hfsmount {
 
 /* This structure describes the HFS specific mount structure data. */
 typedef struct hfsmount {

-       u_int8_t                        hfs_fs_ronly;                   /* Whether this was mounted as read-initially  */
-       u_int8_t                        hfs_unknownpermissions; /* Whether this was mounted with MNT_UNKNOWNPERMISSIONS */
-       u_int8_t                        hfs_media_writeable;
-       u_int8_t                        hfs_orphans_cleaned;
-       
+       u_int32_t     hfs_flags;              /* see below */
+

        /* Physical Description */
        /* Physical Description */

-       u_long                          hfs_phys_block_count;   /* Num of PHYSICAL blocks of volume */
-       u_long                          hfs_phys_block_size;    /* Always a multiple of 512 */
+       u_long        hfs_phys_block_size;    /* Always a multiple of 512 */
+       daddr64_t     hfs_phys_block_count;   /* Num of PHYSICAL blocks of volume */
+       daddr64_t     hfs_alt_id_sector;      /* location of alternate VH/MDB */

 
        /* Access to VFS and devices */
        struct mount            *hfs_mp;                                /* filesystem vfs structure */
        struct vnode            *hfs_devvp;                             /* block device mounted vnode */
 
        /* Access to VFS and devices */
        struct mount            *hfs_mp;                                /* filesystem vfs structure */
        struct vnode            *hfs_devvp;                             /* block device mounted vnode */

-       dev_t                           hfs_raw_dev;                    /* device mounted */
-       struct netexport        hfs_export;                             /* Export information */
-       u_int32_t                       hfs_logBlockSize;               /* Size of buffer cache buffer for I/O */
+       struct vnode *          hfs_extents_vp;
+       struct vnode *          hfs_catalog_vp;
+       struct vnode *          hfs_allocation_vp;
+       struct vnode *          hfs_attribute_vp;
+       dev_t                   hfs_raw_dev;                    /* device mounted */
+       u_int32_t               hfs_logBlockSize;               /* Size of buffer cache buffer for I/O */

        
        /* Default values for HFS standard and non-init access */
        
        /* Default values for HFS standard and non-init access */

-       uid_t                           hfs_uid;                                /* uid to set as owner of the files */
-       gid_t                           hfs_gid;                                /* gid to set as owner of the files */
-       mode_t                          hfs_dir_mask;                   /* mask to and with directory protection bits */
-       mode_t                          hfs_file_mask;                  /* mask to and with file protection bits */
-       u_long                          hfs_encoding;                   /* Defualt encoding for non hfs+ volumes */     
-
-       /* simple lock for shared meta renaming */
-       simple_lock_data_t      hfs_renamelock;
-
-       /* HFS Specific */
-       struct vfsVCB           hfs_vcb;
+       uid_t         hfs_uid;            /* uid to set as owner of the files */
+       gid_t         hfs_gid;            /* gid to set as owner of the files */
+       mode_t        hfs_dir_mask;       /* mask to and with directory protection bits */
+       mode_t        hfs_file_mask;      /* mask to and with file protection bits */
+       u_long        hfs_encoding;       /* Defualt encoding for non hfs+ volumes */   
+
+       /* Persistent fields (on disk, dynamic) */
+       time_t        hfs_mtime;          /* file system last modification time */
+       u_int32_t     hfs_filecount;      /* number of files in file system */
+       u_int32_t     hfs_dircount;       /* number of directories in file system */
+       u_int32_t     freeBlocks;         /* free allocation blocks */
+       u_int32_t     nextAllocation;     /* start of next allocation search */
+       u_int32_t     vcbNxtCNID;         /* next unused catalog node ID */
+       u_int32_t     vcbWrCnt;           /* file system write count */
+       u_int64_t     encodingsBitmap;    /* in-use encodings */
+       u_int16_t     vcbNmFls;           /* HFS Only - root dir file count */
+       u_int16_t     vcbNmRtDirs;        /* HFS Only - root dir directory count */
+
+       /* Persistent fields (on disk, static) */
+       u_int16_t                       vcbSigWord;
+       int16_t                         vcbFlags;
+       u_int32_t                       vcbAtrb;
+       u_int32_t                       vcbJinfoBlock;
+       time_t        hfs_itime;   /* file system creation time */
+       time_t        hfs_btime;   /* file system last backup time */
+       u_int32_t                       blockSize;      /* size of allocation blocks */
+       u_int32_t                       totalBlocks;    /* total allocation blocks */
+       int32_t                         vcbClpSiz;
+       u_int32_t     vcbFndrInfo[8];
+       int16_t                         vcbVBMSt;               /* HFS only */
+       int16_t                         vcbAlBlSt;              /* HFS only */
+
+       /* vcb stuff */
+       u_int8_t                        vcbVN[256];             /* volume name in UTF-8 */
+       u_int32_t                       volumeNameEncodingHint;
+       u_int32_t                       hfsPlusIOPosOffset;     /* Disk block where HFS+ starts */
+       u_int32_t                       vcbVBMIOSize;           /* volume bitmap I/O size */
+       
+       /* cache of largest known free extents */
+       u_int32_t                       vcbFreeExtCnt;
+       HFSPlusExtentDescriptor vcbFreeExt[kMaxFreeExtents];
+       
+       u_int32_t               reserveBlocks;          /* free block reserve */
+       u_int32_t               loanedBlocks;           /* blocks on loan for delayed allocations */
+       
+       u_int32_t                       localCreateDate;        /* creation times for HFS+ volumes are in local time */

        struct cat_desc         hfs_privdir_desc;
        struct cat_attr         hfs_privdir_attr;
        u_int32_t               hfs_metadata_createdate;
        hfs_to_unicode_func_t   hfs_get_unicode;
        unicode_to_hfs_func_t   hfs_get_hfsname;
  
        struct cat_desc         hfs_privdir_desc;
        struct cat_attr         hfs_privdir_attr;
        u_int32_t               hfs_metadata_createdate;
        hfs_to_unicode_func_t   hfs_get_unicode;
        unicode_to_hfs_func_t   hfs_get_hfsname;
  

+       /* Quota variables: */

        struct quotafile        hfs_qfiles[MAXQUOTAS];    /* quota files */
 
        struct quotafile        hfs_qfiles[MAXQUOTAS];    /* quota files */
 

-       // XXXdbg
+       /* Journaling variables: */

        void                *jnl;           // the journal for this volume (if one exists)
        struct vnode        *jvp;           // device where the journal lives (may be equal to devvp)
        u_int32_t            jnl_start;     // start block of the journal file (so we don't delete it)
        void                *jnl;           // the journal for this volume (if one exists)
        struct vnode        *jvp;           // device where the journal lives (may be equal to devvp)
        u_int32_t            jnl_start;     // start block of the journal file (so we don't delete it)

+       u_int32_t            jnl_size;

        u_int32_t            hfs_jnlfileid;
        u_int32_t            hfs_jnlinfoblkid;
        u_int32_t            hfs_jnlfileid;
        u_int32_t            hfs_jnlinfoblkid;

-    volatile int         readers;
-       volatile int         blocker;
+       lck_rw_t             hfs_global_lock;
+       u_int32_t            hfs_global_lock_nesting;
+       
+       /* Notification variables: */
+       unsigned long           hfs_notification_conditions;
+       u_int32_t               hfs_freespace_notify_warninglimit;
+       u_int32_t               hfs_freespace_notify_desiredlevel;
+
+       /* time mounted and last mounted mod time "snapshot" */
+       time_t          hfs_mount_time;
+       time_t          hfs_last_mounted_mtime;
+
+       /* Metadata allocation zone variables: */
+       u_int32_t       hfs_metazone_start;
+       u_int32_t       hfs_metazone_end;
+       u_int32_t       hfs_hotfile_start;
+       u_int32_t       hfs_hotfile_end;
+       int             hfs_hotfile_freeblks;
+       int             hfs_hotfile_maxblks;
+       int             hfs_overflow_maxblks;
+       int             hfs_catalog_maxblks;
+
+       /* Hot File Clustering variables: */
+       lck_mtx_t       hfc_mutex;      /* serialize hot file stages */
+       enum hfc_stage  hfc_stage;      /* what are we up to... */
+       time_t          hfc_timebase;   /* recording period start time */
+       time_t          hfc_timeout;    /* recording period stop time */
+       void *          hfc_recdata;    /* recording data (opaque) */
+       int             hfc_maxfiles;   /* maximum files to track */
+       struct vnode *  hfc_filevp;
+
+#ifdef HFS_SPARSE_DEV
+       /* Sparse device variables: */
+       struct vnode * hfs_backingfs_rootvp;
+       int            hfs_sparsebandblks;
+#endif
+       size_t         hfs_max_inline_attrsize;
+
+       lck_mtx_t      hfs_mutex;      /* protects access to hfsmount data */
+       void          *hfs_freezing_proc;  /* who froze the fs */
+       lck_rw_t       hfs_insync;     /* protects sync/freeze interaction */
+
+       /* Resize variables: */
+       u_int32_t               hfs_resize_filesmoved;
+       u_int32_t               hfs_resize_totalfiles;

 } hfsmount_t;
 
 } hfsmount_t;
 

-#define hfs_private_metadata_dir       hfs_privdir_desc.cd_cnid
-
-#define hfs_global_shared_lock_acquire(hfsmp)    \
-    do { \
-       if (hfsmp->blocker) { \
-              tsleep((caddr_t)&hfsmp->blocker, PRIBIO, "journal_blocker", 0); \
-           continue; \
-          } \
-          hfsmp->readers++; \
-       break; \
-       } while (1)
-
-#define hfs_global_shared_lock_release(hfsmp)    \
-    do { \
-           hfsmp->readers--; \
-           if (hfsmp->readers == 0) { \
-               wakeup((caddr_t)&hfsmp->readers); \
-        } \
-    } while (0)
-
-#define hfs_global_exclusive_lock_acquire(hfsmp) \
-    do { \
-       if (hfsmp->blocker) { \
-              tsleep((caddr_t)&hfsmp->blocker, PRIBIO, "journal_blocker", 0); \
-           continue; \
-          } \
-       if (hfsmp->readers != 0) { \
-              tsleep((caddr_t)&hfsmp->readers, PRIBIO, "journal_enable/disble", 0); \
-           continue; \
-       } \
-       hfsmp->blocker = 1; \
-       break; \
-       } while (1)
-     
-#define hfs_global_exclusive_lock_release(hfsmp) \
-    hfsmp->blocker = 0; \
-       wakeup((caddr_t)&hfsmp->blocker)
+typedef hfsmount_t  ExtendedVCB;
+
+/* Aliases for legacy field names */
+#define vcbCrDate          hfs_itime
+#define vcbLsMod           hfs_mtime
+#define vcbVolBkUp         hfs_btime
+#define extentsRefNum      hfs_extents_vp
+#define catalogRefNum      hfs_catalog_vp
+#define allocationsRefNum  hfs_allocation_vp
+#define vcbFilCnt          hfs_filecount
+#define vcbDirCnt          hfs_dircount
+
+
+/* HFS mount point flags */
+#define HFS_READ_ONLY             0x001
+#define HFS_UNKNOWN_PERMS         0x002
+#define HFS_WRITEABLE_MEDIA       0x004
+#define HFS_CLEANED_ORPHANS       0x008
+#define HFS_X                     0x010
+#define HFS_CASE_SENSITIVE        0x020
+#define HFS_STANDARD              0x040
+#define HFS_METADATA_ZONE         0x080
+#define HFS_FRAGMENTED_FREESPACE  0x100
+#define HFS_NEED_JNL_RESET        0x200
+#define HFS_HAS_SPARSE_DEVICE     0x400
+#define HFS_RESIZE_IN_PROGRESS    0x800
+
+
+#define HFS_MOUNT_LOCK(hfsmp, metadata)                      \
+       {                                                    \
+               if ((metadata) && 1)                         \
+                       lck_mtx_lock(&(hfsmp)->hfs_mutex);   \
+       }                                                    \
+
+#define HFS_MOUNT_UNLOCK(hfsmp, metadata)                    \
+       {                                                    \
+               if ((metadata) && 1)                         \
+                       lck_mtx_unlock(&(hfsmp)->hfs_mutex); \
+       }                                                    \
+
+#define hfs_global_exclusive_lock_acquire(hfsmp) lck_rw_lock_exclusive(&(hfsmp)->hfs_global_lock)
+#define hfs_global_exclusive_lock_release(hfsmp) lck_rw_done(&(hfsmp)->hfs_global_lock)
+

 
 #define MAXHFSVNODELEN         31
 
 
 #define MAXHFSVNODELEN         31
 


@@ -276,88 +307,21 @@ typedef struct filefork FCB;
 #define MAKE_INODE_NAME(name,linkno) \
            (void) sprintf((name), "%s%d", HFS_INODE_PREFIX, (linkno))
 
 #define MAKE_INODE_NAME(name,linkno) \
            (void) sprintf((name), "%s%d", HFS_INODE_PREFIX, (linkno))
 

-/*
- *     Write check macro
- */
-#define        WRITE_CK(VNODE, FUNC_NAME)      {                               \
-    if ((VNODE)->v_mount->mnt_flag & MNT_RDONLY) {                     \
-        DBG_ERR(("%s: ATTEMPT TO WRITE A READONLY VOLUME\n",   \
-                 FUNC_NAME));  \
-                     return(EROFS);                                                    \
-    }                                                                  \
-}
-
-/* structure to hold a "." or ".." directory entry (12 bytes) */
-typedef struct hfsdotentry {
-       u_int32_t       d_fileno;       /* unique file number */
-       u_int16_t       d_reclen;       /* length of this structure */
-       u_int8_t        d_type;         /* dirent file type */
-       u_int8_t        d_namelen;      /* len of filename */
-       char            d_name[4];      /* "." or ".." */
-} hfsdotentry;
+#define HFS_INODE_PREFIX_LEN   5
+

 
 #define HFS_AVERAGE_NAME_SIZE  22
 #define AVERAGE_HFSDIRENTRY_SIZE  (8+HFS_AVERAGE_NAME_SIZE+4)
 
 #define HFS_AVERAGE_NAME_SIZE  22
 #define AVERAGE_HFSDIRENTRY_SIZE  (8+HFS_AVERAGE_NAME_SIZE+4)

-#define MAX_HFSDIRENTRY_SIZE   sizeof(struct dirent)
-
-#define DIRENTRY_SIZE(namlen) \
-    ((sizeof(struct dirent) - (NAME_MAX+1)) + (((namlen)+1 + 3) &~ 3))
-

 
 

-enum {
-       kCatalogFolderNode = 1,
-       kCatalogFileNode = 2
-};
-
-/* 
- * CatalogNodeData has same layout as the on-disk HFS Plus file/dir records.
- * Classic hfs file/dir records are converted to match this layout.
- * 
- * The cnd_extra padding allows big hfs plus thread records (520 bytes max)
- * to be read onto this stucture during a cnid lookup.
- *
- */
-struct CatalogNodeData {
-       int16_t                 cnd_type;
-       u_int16_t               cnd_flags;
-       u_int32_t               cnd_valence;    /* dirs only */
-       u_int32_t               cnd_nodeID;
-       u_int32_t               cnd_createDate;
-       u_int32_t               cnd_contentModDate;
-       u_int32_t               cnd_attributeModDate;
-       u_int32_t               cnd_accessDate;
-       u_int32_t               cnd_backupDate;
-       u_int32_t               cnd_ownerID;
-       u_int32_t               cnd_groupID;
-       u_int8_t                cnd_adminFlags;  /* super-user changeable flags */
-       u_int8_t                cnd_ownerFlags;  /* owner changeable flags */
-       u_int16_t               cnd_mode;        /* file type + permission bits */
-       union {
-           u_int32_t   cndu_iNodeNum;   /* indirect links only */
-           u_int32_t   cndu_linkCount;  /* indirect nodes only */
-           u_int32_t   cndu_rawDevice;  /* special files (FBLK and FCHR) only */
-       } cnd_un;
-       u_int8_t                cnd_finderInfo[32];
-       u_int32_t               cnd_textEncoding;
-       u_int32_t               cnd_reserved;
-       HFSPlusForkData cnd_datafork;
-       HFSPlusForkData cnd_rsrcfork;
-       u_int32_t       cnd_iNodeNumCopy;
-       u_int32_t       cnd_linkCNID;   /* for hard links only */
-       u_int8_t        cnd_extra[264]; /* make struct at least 520 bytes long */
-};
-typedef struct CatalogNodeData CatalogNodeData;
-
-#define        cnd_iNodeNum            cnd_un.cndu_iNodeNum
-#define        cnd_linkCount           cnd_un.cndu_linkCount
-#define        cnd_rawDevice           cnd_un.cndu_rawDevice
+#define STD_DIRENT_LEN(namlen) \
+       ((sizeof(struct dirent) - (NAME_MAX+1)) + (((namlen)+1 + 3) &~ 3))

 
 

+#define EXT_DIRENT_LEN(namlen) \
+       ((sizeof(struct direntry) + (namlen) - (MAXPATHLEN-1) + 3) & ~3)

 
 
 enum { kHFSPlusMaxFileNameBytes = kHFSPlusMaxFileNameChars * 3 };
 
 
 
 enum { kHFSPlusMaxFileNameBytes = kHFSPlusMaxFileNameChars * 3 };
 

-enum { kdirentMaxNameBytes = NAME_MAX };
-

 
 /* macro to determine if hfs or hfsplus */
 #define ISHFSPLUS(VCB) ((VCB)->vcbSigWord == kHFSPlusSigWord)
 
 /* macro to determine if hfs or hfsplus */
 #define ISHFSPLUS(VCB) ((VCB)->vcbSigWord == kHFSPlusSigWord)


@@ -367,25 +331,28 @@ enum { kdirentMaxNameBytes = NAME_MAX };
 /*
  * Various ways to acquire a VFS mount point pointer:
  */
 /*
  * Various ways to acquire a VFS mount point pointer:
  */

-#define VTOVFS(VP) ((VP)->v_mount)
+#define VTOVFS(VP)  vnode_mount((VP))

 #define HFSTOVFS(HFSMP) ((HFSMP)->hfs_mp)
 #define HFSTOVFS(HFSMP) ((HFSMP)->hfs_mp)

-#define VCBTOVFS(VCB) (((struct vfsVCB *)(VCB))->vcb_hfsmp->hfs_mp)
+#define VCBTOVFS(VCB)   HFSTOVFS(VCB)

 
 /*
  * Various ways to acquire an HFS mount point pointer:
  */
 
 /*
  * Various ways to acquire an HFS mount point pointer:
  */

-#define VTOHFS(VP) ((struct hfsmount *)((VP)->v_mount->mnt_data))
-#define        VFSTOHFS(MP) ((struct hfsmount *)(MP)->mnt_data)        
-#define VCBTOHFS(VCB) (((struct vfsVCB *)(VCB))->vcb_hfsmp)
-#define FCBTOHFS(FCB) ((struct hfsmount *)(FCB)->ff_cp->c_vp->v_mount->mnt_data)
+#define VTOHFS(VP)  ((struct hfsmount *)vfs_fsprivate(vnode_mount((VP))))
+#define        VFSTOHFS(MP)  ((struct hfsmount *)vfs_fsprivate((MP)))
+#define VCBTOHFS(VCB) (VCB)
+#define FCBTOHFS(FCB)  ((struct hfsmount *)vfs_fsprivate(vnode_mount((FCB)->ff_cp->c_vp)))

 
 /*
 
 /*

- * Various ways to acquire a VCB pointer:
+ * Various ways to acquire a VCB (legacy) pointer:

  */
  */

-#define VTOVCB(VP) (&(((struct hfsmount *)((VP)->v_mount->mnt_data))->hfs_vcb.vcb_vcb))
-#define VFSTOVCB(MP) (&(((struct hfsmount *)(MP)->mnt_data)->hfs_vcb.vcb_vcb))
-#define HFSTOVCB(HFSMP) (&(HFSMP)->hfs_vcb.vcb_vcb)
-#define FCBTOVCB(FCB) (&(((struct hfsmount *)((FCB)->ff_cp->c_vp->v_mount->mnt_data))->hfs_vcb.vcb_vcb))
+#define VTOVCB(VP)       VTOHFS(VP)
+#define VFSTOVCB(MP)     VFSTOHFS(MP)
+#define HFSTOVCB(HFSMP)  (HFSMP)
+#define FCBTOVCB(FCB)    FCBTOHFS(FCB)
+
+
+#define HFS_KNOTE(vp, hint) KNOTE(&VTOC(vp)->c_knotes, (hint))

 
 
 #define E_NONE 0
 
 
 #define E_NONE 0


@@ -400,6 +367,17 @@ enum { kdirentMaxNameBytes = NAME_MAX };
 #define HFS_ALT_SECTOR(blksize, blkcnt)  (((blkcnt) - 1) - (512 / (blksize)))
 #define HFS_ALT_OFFSET(blksize)          ((blksize) > 1024 ? (blksize) - 1024 : 0)
 
 #define HFS_ALT_SECTOR(blksize, blkcnt)  (((blkcnt) - 1) - (512 / (blksize)))
 #define HFS_ALT_OFFSET(blksize)          ((blksize) > 1024 ? (blksize) - 1024 : 0)
 

+
+/*
+ * HFS specific fcntl()'s
+ */
+#define HFS_BULKACCESS      (FCNTL_FS_SPECIFIC_BASE + 0x00001)
+#define HFS_GET_MOUNT_TIME  (FCNTL_FS_SPECIFIC_BASE + 0x00002)
+#define HFS_GET_LAST_MTIME  (FCNTL_FS_SPECIFIC_BASE + 0x00003)
+#define HFS_GET_BOOT_INFO   (FCNTL_FS_SPECIFIC_BASE + 0x00004)
+#define HFS_SET_BOOT_INFO   (FCNTL_FS_SPECIFIC_BASE + 0x00005)
+
+

 /*
  *     This is the straight GMT conversion constant:
  *     00:00:00 January 1, 1970 - 00:00:00 January 1, 1904
 /*
  *     This is the straight GMT conversion constant:
  *     00:00:00 January 1, 1970 - 00:00:00 January 1, 1904


@@ -408,26 +386,18 @@ enum { kdirentMaxNameBytes = NAME_MAX };
 #define MAC_GMT_FACTOR         2082844800UL
 
 
 #define MAC_GMT_FACTOR         2082844800UL
 
 

-u_int32_t to_bsd_time(u_int32_t hfs_time);
-u_int32_t to_hfs_time(u_int32_t bsd_time);
+time_t to_bsd_time(u_int32_t hfs_time);
+u_int32_t to_hfs_time(time_t bsd_time);

 
 

-int hfs_flushfiles(struct mount *mp, int flags, struct proc *p);

 int hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush);
 #define HFS_ALTFLUSH   1
 
 int hfs_flushvolumeheader(struct hfsmount *hfsmp, int waitfor, int altflush);
 #define HFS_ALTFLUSH   1
 

-short hfsUnmount(struct hfsmount *hfsmp, struct proc *p);
-
-
-extern int hfs_getcnode(struct hfsmount *hfsmp, cnid_t cnid, struct cat_desc *descp,
-                       int wantrsrc, struct cat_attr *attrp, struct cat_fork *forkp,
-                       struct vnode **vpp);
+extern int hfsUnmount(struct hfsmount *hfsmp, struct proc *p);

 
 

-extern int hfs_getnewvnode(struct hfsmount *hfsmp, struct cnode *cp,
+extern int hfs_getnewvnode(struct hfsmount *hfsmp, struct vnode *dvp, struct componentname *cnp,

                            struct cat_desc *descp, int wantrsrc, struct cat_attr *attrp,
                            struct cat_fork *forkp, struct vnode **vpp);
 
                            struct cat_desc *descp, int wantrsrc, struct cat_attr *attrp,
                            struct cat_fork *forkp, struct vnode **vpp);
 

-extern int hfs_metafilelocking(struct hfsmount *hfsmp, u_long fileID, u_int flags, struct proc *p);
-

 extern u_int32_t hfs_freeblks(struct hfsmount * hfsmp, int wantreserve);
 
 extern void hfs_remove_orphans(struct hfsmount *);
 extern u_int32_t hfs_freeblks(struct hfsmount * hfsmp, int wantreserve);
 
 extern void hfs_remove_orphans(struct hfsmount *);


@@ -457,13 +427,13 @@ unsigned long BestBlockSizeFit(unsigned long allocationBlockSize,
 OSErr  hfs_MountHFSVolume(struct hfsmount *hfsmp, HFSMasterDirectoryBlock *mdb,
                struct proc *p);
 OSErr  hfs_MountHFSPlusVolume(struct hfsmount *hfsmp, HFSPlusVolumeHeader *vhp,
 OSErr  hfs_MountHFSVolume(struct hfsmount *hfsmp, HFSMasterDirectoryBlock *mdb,
                struct proc *p);
 OSErr  hfs_MountHFSPlusVolume(struct hfsmount *hfsmp, HFSPlusVolumeHeader *vhp,

-               off_t embeddedOffset, u_int64_t disksize, struct proc *p, void *args);
+               off_t embeddedOffset, u_int64_t disksize, struct proc *p, void *args, kauth_cred_t cred);

 
 extern int     hfs_early_journal_init(struct hfsmount *hfsmp, HFSPlusVolumeHeader *vhp,
 
 extern int     hfs_early_journal_init(struct hfsmount *hfsmp, HFSPlusVolumeHeader *vhp,

-                                                          void *_args, int embeddedOffset, int mdb_offset,
+                                                          void *_args, off_t embeddedOffset, daddr64_t mdb_offset,

                                                           HFSMasterDirectoryBlock *mdbp, struct ucred *cred);
                                                           HFSMasterDirectoryBlock *mdbp, struct ucred *cred);

-extern u_long  GetFileInfo(ExtendedVCB *vcb, u_int32_t dirid, char *name,
-                                       struct cat_attr *fattr, struct cat_fork *forkinfo);
+extern u_long  GetFileInfo(ExtendedVCB *vcb, u_int32_t dirid, const char *name,
+                                                  struct cat_attr *fattr, struct cat_fork *forkinfo);

 
 int hfs_getconverter(u_int32_t encoding, hfs_to_unicode_func_t *get_unicode,
                     unicode_to_hfs_func_t *get_hfsname);
 
 int hfs_getconverter(u_int32_t encoding, hfs_to_unicode_func_t *get_unicode,
                     unicode_to_hfs_func_t *get_hfsname);


@@ -494,6 +464,52 @@ extern void replace_desc(struct cnode *cp, struct cat_desc *cdp);
 
 extern int hfs_namecmp(const char *, size_t, const char *, size_t);
 
 
 extern int hfs_namecmp(const char *, size_t, const char *, size_t);
 

+extern int  hfs_virtualmetafile(struct cnode *);
+
+void hfs_generate_volume_notifications(struct hfsmount *hfsmp);
+
+__private_extern__ u_int32_t hfs_getencodingbias(void);
+__private_extern__ void hfs_setencodingbias(u_int32_t bias);
+
+extern int hfs_vgetrsrc(struct hfsmount *hfsmp, struct vnode *vp,
+                       struct vnode **rvpp, struct proc *p);
+
+extern int hfs_update(struct vnode *, int);
+
+extern int hfs_truncate(struct vnode *, off_t, int, int, vfs_context_t);
+
+extern int hfs_fsync(struct vnode *, int, int, struct proc *);
+
+extern int hfs_access(struct vnode *, mode_t, struct ucred *, struct proc *);
+
+extern int hfs_vget(struct hfsmount *, cnid_t, struct vnode **, int);
+
+extern int hfs_bmap(struct vnode *, daddr_t, struct vnode **, daddr64_t *, int *);
+
+extern int hfs_removeallattr(struct hfsmount *hfsmp, u_int32_t fileid);
+
+__private_extern__ int hfs_start_transaction(struct hfsmount *hfsmp);
+__private_extern__ int hfs_end_transaction(struct hfsmount *hfsmp);
+
+extern int  hfs_setextendedsecurity(struct hfsmount *hfsmp, int state);
+extern void hfs_checkextendedsecurity(struct hfsmount *hfsmp);
+
+extern int  hfs_extendfs(struct hfsmount *, u_int64_t, vfs_context_t);
+extern int  hfs_truncatefs(struct hfsmount *, u_int64_t, vfs_context_t);
+extern int  hfs_resize_progress(struct hfsmount *, u_int32_t *);
+
+extern int  hfs_isallocated(struct hfsmount *, u_long, u_long);
+
+
+/* HFS System file locking */
+#define SFL_CATALOG     0x0001
+#define SFL_EXTENTS     0x0002
+#define SFL_BITMAP      0x0004
+#define SFL_ATTRIBUTE   0x0008
+#define SFL_VALIDMASK   (SFL_CATALOG | SFL_EXTENTS | SFL_BITMAP | SFL_ATTRIBUTE)
+
+extern int  hfs_systemfile_lock(struct hfsmount *, int, enum hfslocktype);
+extern void hfs_systemfile_unlock(struct hfsmount *, int);

 
 #endif /* __APPLE_API_PRIVATE */
 #endif /* KERNEL */
 
 #endif /* __APPLE_API_PRIVATE */
 #endif /* KERNEL */