xnu-1228.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_btreeio.c

diff --git a/bsd/hfs/hfs_btreeio.c b/bsd/hfs/hfs_btreeio.c
index 1ae5a93b7627244886686acba8636fd0e4ccd43a..0c81c879f594ccb162b71f1b1383646300762895 100644 (file)
--- a/bsd/hfs/hfs_btreeio.c
+++ b/bsd/hfs/hfs_btreeio.c
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -29,6 +29,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>

+#include <sys/buf_internal.h>

 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>


@@ -39,18 +40,22 @@
 #include "hfs_cnode.h"
 #include "hfs_dbg.h"
 #include "hfs_endian.h"
 #include "hfs_cnode.h"
 #include "hfs_dbg.h"
 #include "hfs_endian.h"

+#include "hfs_btreeio.h"

 
 #include "hfscommon/headers/FileMgrInternal.h"
 #include "hfscommon/headers/BTreesPrivate.h"
 
 #define FORCESYNCBTREEWRITES 0
 
 
 #include "hfscommon/headers/FileMgrInternal.h"
 #include "hfscommon/headers/BTreesPrivate.h"
 
 #define FORCESYNCBTREEWRITES 0
 

+/* From bsd/vfs/vfs_bio.c */
+extern int bdwrite_internal(struct buf *, int);

 
 static int ClearBTNodes(struct vnode *vp, long blksize, off_t offset, off_t amount);
 
 static int ClearBTNodes(struct vnode *vp, long blksize, off_t offset, off_t amount);

+static int btree_journal_modify_block_end(struct hfsmount *hfsmp, struct buf *bp);

 
 
 __private_extern__
 
 
 __private_extern__

-OSStatus SetBTreeBlockSize(FileReference vp, ByteCount blockSize, ItemCount minBlockCount)
+OSStatus SetBTreeBlockSize(FileReference vp, ByteCount blockSize, __unused ItemCount minBlockCount)

 {
        BTreeControlBlockPtr    bTreePtr;
        
 {
        BTreeControlBlockPtr    bTreePtr;
        


@@ -67,7 +72,7 @@ OSStatus SetBTreeBlockSize(FileReference vp, ByteCount blockSize, ItemCount minB
 
 
 __private_extern__
 
 
 __private_extern__

-OSStatus GetBTreeBlock(FileReference vp, UInt32 blockNum, GetBlockOptions options, BlockDescriptor *block)
+OSStatus GetBTreeBlock(FileReference vp, u_int32_t blockNum, GetBlockOptions options, BlockDescriptor *block)

 {
     OSStatus    retval = E_NONE;
     struct buf   *bp = NULL;
 {
     OSStatus    retval = E_NONE;
     struct buf   *bp = NULL;


@@ -118,7 +123,7 @@ OSStatus GetBTreeBlock(FileReference vp, UInt32 blockNum, GetBlockOptions option
                 * This is necessary on big endian since the test below won't trigger.
                 */
                 retval = hfs_swap_BTNode (block, vp, kSwapBTNodeBigToHost);
                 * This is necessary on big endian since the test below won't trigger.
                 */
                 retval = hfs_swap_BTNode (block, vp, kSwapBTNodeBigToHost);

-            } else if (*((UInt16 *)((char *)block->buffer + (block->blockSize - sizeof (UInt16)))) == 0x0e00) {
+            } else if (*((u_int16_t *)((char *)block->buffer + (block->blockSize - sizeof (u_int16_t)))) == 0x0e00) {

                                /*
                                 * The node was left in the cache in non-native order, so swap it.
                                 * This only happens on little endian, after the node is written
                                /*
                                 * The node was left in the cache in non-native order, so swap it.
                                 * This only happens on little endian, after the node is written


@@ -162,7 +167,7 @@ void ModifyBlockStart(FileReference vp, BlockDescPtr blockPtr)
        
     bp = (struct buf *) blockPtr->blockHeader;
     if (bp == NULL) {
        
     bp = (struct buf *) blockPtr->blockHeader;
     if (bp == NULL) {

-               panic("ModifyBlockStart: null bp  for blockdescptr 0x%x?!?\n", blockPtr);
+               panic("ModifyBlockStart: null bp  for blockdescptr %p?!?\n", blockPtr);

                return;
     }
 
                return;
     }
 


@@ -170,9 +175,10 @@ void ModifyBlockStart(FileReference vp, BlockDescPtr blockPtr)
        blockPtr->isModified = 1;
 }
 
        blockPtr->isModified = 1;
 }
 

-static int
-btree_journal_modify_block_end(struct hfsmount *hfsmp, struct buf *bp)
+static void
+btree_swap_node(struct buf *bp, __unused void *arg)

 {
 {

+    // struct hfsmount *hfsmp = (struct hfsmount *)arg;

        int retval;
     struct vnode *vp = buf_vnode(bp);
     BlockDescriptor block;
        int retval;
     struct vnode *vp = buf_vnode(bp);
     BlockDescriptor block;


@@ -185,12 +191,17 @@ btree_journal_modify_block_end(struct hfsmount *hfsmp, struct buf *bp)
     block.blockReadFromDisk = (buf_fromcache(bp) == 0);
     block.blockSize = buf_count(bp);
 
     block.blockReadFromDisk = (buf_fromcache(bp) == 0);
     block.blockSize = buf_count(bp);
 

-    // XXXdbg have to swap the data before it goes in the journal
+    // swap the data now that this node is ready to go to disk

     retval = hfs_swap_BTNode (&block, vp, kSwapBTNodeHostToBig);
     if (retval)
     retval = hfs_swap_BTNode (&block, vp, kSwapBTNodeHostToBig);
     if (retval)

-       panic("btree_journal_modify_block_end: about to write corrupt node!\n");
+       panic("btree_swap_node: about to write corrupt node!\n");
+}

 
 

-    return journal_modify_block_end(hfsmp->jnl, bp);
+
+static int
+btree_journal_modify_block_end(struct hfsmount *hfsmp, struct buf *bp)
+{
+    return journal_modify_block_end(hfsmp->jnl, bp, btree_swap_node, hfsmp);

 }
 
 
 }
 
 


@@ -198,7 +209,6 @@ __private_extern__
 OSStatus ReleaseBTreeBlock(FileReference vp, BlockDescPtr blockPtr, ReleaseBlockOptions options)
 {
     struct hfsmount    *hfsmp = VTOHFS(vp);
 OSStatus ReleaseBTreeBlock(FileReference vp, BlockDescPtr blockPtr, ReleaseBlockOptions options)
 {
     struct hfsmount    *hfsmp = VTOHFS(vp);

-    extern int bdwrite_internal(struct buf *, int);

     OSStatus   retval = E_NONE;
     struct buf *bp = NULL;
 
     OSStatus   retval = E_NONE;
     struct buf *bp = NULL;
 


@@ -221,7 +231,7 @@ OSStatus ReleaseBTreeBlock(FileReference vp, BlockDescPtr blockPtr, ReleaseBlock
         if (options & kForceWriteBlock) {
                        if (hfsmp->jnl) {
                                if (blockPtr->isModified == 0) {
         if (options & kForceWriteBlock) {
                        if (hfsmp->jnl) {
                                if (blockPtr->isModified == 0) {

-                                       panic("hfs: releaseblock: modified is 0 but forcewrite set! bp 0x%x\n", bp);
+                                       panic("hfs: releaseblock: modified is 0 but forcewrite set! bp %p\n", bp);

                                }
 
                                retval = btree_journal_modify_block_end(hfsmp, bp);
                                }
 
                                retval = btree_journal_modify_block_end(hfsmp, bp);


@@ -241,8 +251,6 @@ OSStatus ReleaseBTreeBlock(FileReference vp, BlockDescPtr blockPtr, ReleaseBlock
                  * isn't going to work.
                  *
                  */
                  * isn't going to work.
                  *
                  */

-                extern int count_lock_queue(void);
-

                 /* Don't hog all the buffers... */
                 if (count_lock_queue() > kMaxLockedMetaBuffers) {
                      hfs_btsync(vp, HFS_SYNCTRANS);
                 /* Don't hog all the buffers... */
                 if (count_lock_queue() > kMaxLockedMetaBuffers) {
                      hfs_btsync(vp, HFS_SYNCTRANS);


@@ -259,7 +267,7 @@ OSStatus ReleaseBTreeBlock(FileReference vp, BlockDescPtr blockPtr, ReleaseBlock
              */
                        if (hfsmp->jnl) {
                                if (blockPtr->isModified == 0) {
              */
                        if (hfsmp->jnl) {
                                if (blockPtr->isModified == 0) {

-                                       panic("hfs: releaseblock: modified is 0 but markdirty set! bp 0x%x\n", bp);
+                                       panic("hfs: releaseblock: modified is 0 but markdirty set! bp %p\n", bp);

                                }
                                retval = btree_journal_modify_block_end(hfsmp, bp);
                                blockPtr->isModified = 0;
                                }
                                retval = btree_journal_modify_block_end(hfsmp, bp);
                                blockPtr->isModified = 0;


@@ -295,28 +303,26 @@ exit:
 }
 
 
 }
 
 

-#define HFS_CLUMP_ADJ_LIMIT  (200*1024*1024)
-

 __private_extern__
 OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
 {
 #pragma unused (maxEOF)
 
        OSStatus        retval = 0, ret = 0;
 __private_extern__
 OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
 {
 #pragma unused (maxEOF)
 
        OSStatus        retval = 0, ret = 0;

-       UInt64          actualBytesAdded, origSize;
-       UInt64          bytesToAdd;
+       int64_t         actualBytesAdded, origSize;
+       u_int64_t       bytesToAdd;

        u_int32_t       startAllocation;
        u_int32_t       fileblocks;
        u_int32_t       startAllocation;
        u_int32_t       fileblocks;

-       BTreeInfoRec btInfo;
+       BTreeInfoRec    btInfo;

        ExtendedVCB     *vcb;
        ExtendedVCB     *vcb;

-       FCB                     *filePtr;
-    struct proc *p = NULL;
-       UInt64          trim = 0;
-       int  lockflags = 0;
+       FCB             *filePtr;
+       struct proc     *p = NULL;
+       int64_t         trim = 0;
+       int             lockflags = 0;

 
        filePtr = GetFileControlBlock(vp);
 
 
        filePtr = GetFileControlBlock(vp);
 

-       if ( minEOF > filePtr->fcbEOF )
+       if ( (off_t)minEOF > filePtr->fcbEOF )

        {
                bytesToAdd = minEOF - filePtr->fcbEOF;
 
        {
                bytesToAdd = minEOF - filePtr->fcbEOF;
 


@@ -329,13 +335,7 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
        }
 
        vcb = VTOVCB(vp);
        }
 
        vcb = VTOVCB(vp);

-
-       /* Take past growth into account when extending the catalog file. */
-       if ((VTOC(vp)->c_fileid == kHFSCatalogFileID) &&
-           (bytesToAdd / vcb->blockSize) < filePtr->fcbExtents[0].blockCount) {
-                       bytesToAdd = filePtr->fcbExtents[0].blockCount * (UInt64)vcb->blockSize;
-                       bytesToAdd = MIN(bytesToAdd, HFS_CLUMP_ADJ_LIMIT);
-       }
+       

        /*
         * The Extents B-tree can't have overflow extents. ExtendFileC will
         * return an error if an attempt is made to extend the Extents B-tree
        /*
         * The Extents B-tree can't have overflow extents. ExtendFileC will
         * return an error if an attempt is made to extend the Extents B-tree


@@ -372,27 +372,29 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
        // of the btree node size.  if we can't get a contiguous chunk that
        // is at least the node size then we break out of the loop and let
        // the error propagate back up.
        // of the btree node size.  if we can't get a contiguous chunk that
        // is at least the node size then we break out of the loop and let
        // the error propagate back up.

-       do {
+       while((off_t)bytesToAdd >= btInfo.nodeSize) {
+           do {

                retval = ExtendFileC(vcb, filePtr, bytesToAdd, 0,
                retval = ExtendFileC(vcb, filePtr, bytesToAdd, 0,

-                                    kEFContigMask | kEFMetadataMask,
-                                    &actualBytesAdded);
+                                    kEFContigMask | kEFMetadataMask | kEFNoClumpMask,
+                                    (int64_t *)&actualBytesAdded);

                if (retval == dskFulErr && actualBytesAdded == 0) {
                if (retval == dskFulErr && actualBytesAdded == 0) {

-
-                       if (bytesToAdd == btInfo.nodeSize || bytesToAdd < (minEOF - origSize)) {
-                               // if we're here there's nothing else to try, we're out
-                               // of space so we break and bail out.
-                               break;
-                       } else {
-                               bytesToAdd >>= 1;
-                               if (bytesToAdd < btInfo.nodeSize) {
-                                       bytesToAdd = btInfo.nodeSize;
-                               } else if ((bytesToAdd % btInfo.nodeSize) != 0) {
-                                       // make sure it's an integer multiple of the nodeSize
-                                       bytesToAdd -= (bytesToAdd % btInfo.nodeSize);
-                               }
-                       }
+                   bytesToAdd >>= 1;
+                   if (bytesToAdd < btInfo.nodeSize) {
+                       break;
+                   } else if ((bytesToAdd % btInfo.nodeSize) != 0) {
+                       // make sure it's an integer multiple of the nodeSize
+                       bytesToAdd -= (bytesToAdd % btInfo.nodeSize);
+                   }

                }
                }

-       } while (retval == dskFulErr && actualBytesAdded == 0);
+           } while (retval == dskFulErr && actualBytesAdded == 0);
+
+           if (retval == dskFulErr && actualBytesAdded == 0 && bytesToAdd <= btInfo.nodeSize) {
+               break;
+           }
+
+           filePtr->fcbEOF = (u_int64_t)filePtr->ff_blocks * (u_int64_t)vcb->blockSize;
+           bytesToAdd = minEOF - filePtr->fcbEOF;
+       }

 
        /*
         * If a new extent was added then move the roving allocator
 
        /*
         * If a new extent was added then move the roving allocator


@@ -402,8 +404,8 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
        if ((retval == 0) &&
            ((VCBTOHFS(vcb)->hfs_flags & HFS_METADATA_ZONE) == 0) &&
            (vcb->nextAllocation > startAllocation) &&
        if ((retval == 0) &&
            ((VCBTOHFS(vcb)->hfs_flags & HFS_METADATA_ZONE) == 0) &&
            (vcb->nextAllocation > startAllocation) &&

-           ((vcb->nextAllocation + fileblocks) < vcb->totalBlocks)) {
-               vcb->nextAllocation += fileblocks;
+           ((vcb->nextAllocation + fileblocks) < vcb->allocLimit)) {
+               HFS_UPDATE_NEXT_ALLOCATION(vcb, vcb->nextAllocation + fileblocks); 

        }
                
        filePtr->fcbEOF = (u_int64_t)filePtr->ff_blocks * (u_int64_t)vcb->blockSize;
        }
                
        filePtr->fcbEOF = (u_int64_t)filePtr->ff_blocks * (u_int64_t)vcb->blockSize;


@@ -412,7 +414,7 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
        // it grew the file to be big enough for our needs.  If this is
        // the case, we don't care about retval so we blow it away.
        //
        // it grew the file to be big enough for our needs.  If this is
        // the case, we don't care about retval so we blow it away.
        //

-       if (filePtr->fcbEOF >= minEOF && retval != 0) {
+       if (filePtr->fcbEOF >= (off_t)minEOF && retval != 0) {

                retval = 0;
        }
 
                retval = 0;
        }
 


@@ -422,9 +424,9 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
        // size.  otherwise we trim back to be an even multiple of the
        // btree node size.
        //
        // size.  otherwise we trim back to be an even multiple of the
        // btree node size.
        //

-       if ((filePtr->fcbEOF < minEOF) || (actualBytesAdded % btInfo.nodeSize) != 0) {
+       if ((filePtr->fcbEOF < (off_t)minEOF) || ((filePtr->fcbEOF - origSize) % btInfo.nodeSize) != 0) {

 
 

-               if (filePtr->fcbEOF < minEOF) {
+               if (filePtr->fcbEOF < (off_t)minEOF) {

                        retval = dskFulErr;
                        
                        if (filePtr->fcbEOF < origSize) {
                        retval = dskFulErr;
                        
                        if (filePtr->fcbEOF < origSize) {


@@ -433,12 +435,8 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
                        }
                        
                        trim = filePtr->fcbEOF - origSize;
                        }
                        
                        trim = filePtr->fcbEOF - origSize;

-                       if (trim != actualBytesAdded) {
-                               panic("hfs: trim == %lld but actualBytesAdded == %lld\n",
-                                         trim, actualBytesAdded);
-                       }

                } else {
                } else {

-                       trim = (actualBytesAdded % btInfo.nodeSize);
+                       trim = ((filePtr->fcbEOF - origSize) % btInfo.nodeSize);

                }
 
                ret = TruncateFileC(vcb, filePtr, filePtr->fcbEOF - trim, 0);
                }
 
                ret = TruncateFileC(vcb, filePtr, filePtr->fcbEOF - trim, 0);


@@ -446,17 +444,16 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
 
                // XXXdbg - panic if the file didn't get trimmed back properly
                if ((filePtr->fcbEOF % btInfo.nodeSize) != 0) {
 
                // XXXdbg - panic if the file didn't get trimmed back properly
                if ((filePtr->fcbEOF % btInfo.nodeSize) != 0) {

-                       panic("hfs: truncate file didn't! fcbEOF %lld nsize %d fcb 0x%x\n",
+                       panic("hfs: truncate file didn't! fcbEOF %lld nsize %d fcb %p\n",

                                  filePtr->fcbEOF, btInfo.nodeSize, filePtr);
                }
 
                if (ret) {
                        // XXXdbg - this probably doesn't need to be a panic()
                                  filePtr->fcbEOF, btInfo.nodeSize, filePtr);
                }
 
                if (ret) {
                        // XXXdbg - this probably doesn't need to be a panic()

-                       panic("hfs: error truncating btree files (sz 0x%llx, trim %lld, ret %d)\n",
-                                 filePtr->fcbEOF, trim, ret);
+                       panic("hfs: error truncating btree files (sz 0x%llx, trim %lld, ret %ld)\n",
+                             filePtr->fcbEOF, trim, ret);

                        goto out;
                }
                        goto out;
                }

-               actualBytesAdded -= trim;

        }
 
        if(VTOC(vp)->c_fileid != kHFSExtentsFileID) {
        }
 
        if(VTOC(vp)->c_fileid != kHFSExtentsFileID) {


@@ -470,7 +467,7 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
        lockflags = 0;
 
        if ((filePtr->fcbEOF % btInfo.nodeSize) != 0) {
        lockflags = 0;
 
        if ((filePtr->fcbEOF % btInfo.nodeSize) != 0) {

-               panic("hfs: extendbtree: fcb 0x%x has eof 0x%llx not a multiple of 0x%x (trim %llx)\n",
+               panic("hfs: extendbtree: fcb %p has eof 0x%llx not a multiple of 0x%x (trim %llx)\n",

                          filePtr, filePtr->fcbEOF, btInfo.nodeSize, trim);
        }
 
                          filePtr, filePtr->fcbEOF, btInfo.nodeSize, trim);
        }
 


@@ -490,7 +487,7 @@ OSStatus ExtendBTreeFile(FileReference vp, FSSize minEOF, FSSize maxEOF)
                (void) hfs_update(vp, TRUE);
        }
 
                (void) hfs_update(vp, TRUE);
        }
 

-       ret = ClearBTNodes(vp, btInfo.nodeSize, filePtr->fcbEOF - actualBytesAdded, actualBytesAdded);
+       ret = ClearBTNodes(vp, btInfo.nodeSize, origSize, (filePtr->fcbEOF - origSize));

 out:
        if (retval == 0)
                retval = ret;
 out:
        if (retval == 0)
                retval = ret;


@@ -560,19 +557,15 @@ ClearBTNodes(struct vnode *vp, long blksize, off_t offset, off_t amount)
 
 extern char  hfs_attrname[];
 
 
 extern char  hfs_attrname[];
 

-extern int  hfs_attrkeycompare(HFSPlusAttrKey *searchKey, HFSPlusAttrKey *trialKey);
-
-int  hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecnt);
-

 /*
  * Create an HFS+ Attribute B-tree File.
  *
 /*
  * Create an HFS+ Attribute B-tree File.
  *

- * A journal transaction must be already started.
+ * No global resources should be held.

  */
 int
  */
 int

-hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecnt)
+hfs_create_attr_btree(struct hfsmount *hfsmp, u_int32_t nodesize, u_int32_t nodecnt)

 {
 {

-       struct vnode* vp = NULL;
+       struct vnode* vp = NULLVP;

        struct cat_desc cndesc;
        struct cat_attr cnattr;
        struct cat_fork cfork;
        struct cat_desc cndesc;
        struct cat_attr cnattr;
        struct cat_fork cfork;


@@ -584,22 +577,45 @@ hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecn
        void * buffer;
        u_int16_t *index;
        u_int16_t  offset;
        void * buffer;
        u_int16_t *index;
        u_int16_t  offset;

+       int intrans = 0;

        int result;
        int result;

+again:
+       /*
+        * Serialize creation using HFS_CREATING_BTREE flag.
+        */
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+       if (hfsmp->hfs_flags & HFS_CREATING_BTREE) {
+                       /* Someone else beat us, wait for them to finish. */
+                       (void) msleep(hfsmp->hfs_attribute_cp, &hfsmp->hfs_mutex,
+                                     PDROP | PINOD, "hfs_create_attr_btree", 0);
+                       if (hfsmp->hfs_attribute_vp) {
+                               return (0);
+                       }
+                       goto again;
+       }
+       hfsmp->hfs_flags |= HFS_CREATING_BTREE;
+       lck_mtx_unlock(&hfsmp->hfs_mutex);

 
 

-       printf("Creating HFS+ Attribute B-tree File (%d nodes) on %s\n", nodecnt, hfsmp->vcbVN);
+       /* Check if were out of usable disk space. */
+       if ((hfs_freeblks(hfsmp, 1) == 0)) {
+               result = ENOSPC;
+               goto exit;
+       }

 
        /*
         * Set up Attribute B-tree vnode
 
        /*
         * Set up Attribute B-tree vnode

+        * (this must be done before we start a transaction
+        *  or take any system file locks)

         */
        bzero(&cndesc, sizeof(cndesc));
        cndesc.cd_parentcnid = kHFSRootParentID;
        cndesc.cd_flags |= CD_ISMETA;
         */
        bzero(&cndesc, sizeof(cndesc));
        cndesc.cd_parentcnid = kHFSRootParentID;
        cndesc.cd_flags |= CD_ISMETA;

-       cndesc.cd_nameptr = hfs_attrname;
+       cndesc.cd_nameptr = (const u_int8_t *)hfs_attrname;

        cndesc.cd_namelen = strlen(hfs_attrname);
        cndesc.cd_cnid = kHFSAttributesFileID;
 
        bzero(&cnattr, sizeof(cnattr));
        cndesc.cd_namelen = strlen(hfs_attrname);
        cndesc.cd_cnid = kHFSAttributesFileID;
 
        bzero(&cnattr, sizeof(cnattr));

-       cnattr.ca_nlink = 1;
+       cnattr.ca_linkcount = 1;

        cnattr.ca_mode = S_IFREG;
        cnattr.ca_fileid = cndesc.cd_cnid;
 
        cnattr.ca_mode = S_IFREG;
        cnattr.ca_fileid = cndesc.cd_cnid;
 


@@ -607,9 +623,9 @@ hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecn
        cfork.cf_clump = nodesize * nodecnt;
 
        result = hfs_getnewvnode(hfsmp, NULL, NULL, &cndesc, 0, &cnattr, &cfork, &vp);
        cfork.cf_clump = nodesize * nodecnt;
 
        result = hfs_getnewvnode(hfsmp, NULL, NULL, &cndesc, 0, &cnattr, &cfork, &vp);

-       if (result)
-               return (result);
-
+       if (result) {
+               goto exit;
+       }

        /*
         * Set up Attribute B-tree control block
         */
        /*
         * Set up Attribute B-tree control block
         */


@@ -633,6 +649,13 @@ hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecn
        /*
         * Allocate some space
         */
        /*
         * Allocate some space
         */

+       if (hfs_start_transaction(hfsmp) != 0) {
+               result = EINVAL;
+               goto exit;
+       }
+       intrans = 1;
+
+       /* Note ExtendBTreeFile will acquire the necessary system file locks. */

        result = ExtendBTreeFile(vp, nodesize, cfork.cf_clump);
        if (result)
                goto exit;
        result = ExtendBTreeFile(vp, nodesize, cfork.cf_clump);
        if (result)
                goto exit;


@@ -661,7 +684,7 @@ hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecn
                panic("hfs_create_attr_btree: bad buffer size (%d)\n", buf_size(bp));
 
        bzero(buffer, nodesize);
                panic("hfs_create_attr_btree: bad buffer size (%d)\n", buf_size(bp));
 
        bzero(buffer, nodesize);

-       index = (int16_t *)buffer;
+       index = (u_int16_t *)buffer;

 
        /* FILL IN THE NODE DESCRIPTOR:  */
        ndp = (BTNodeDescriptor *)buffer;
 
        /* FILL IN THE NODE DESCRIPTOR:  */
        ndp = (BTNodeDescriptor *)buffer;


@@ -671,7 +694,7 @@ hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecn
        index[(nodesize / 2) - 1] = offset;
 
        /* FILL IN THE HEADER RECORD:  */
        index[(nodesize / 2) - 1] = offset;
 
        /* FILL IN THE HEADER RECORD:  */

-       bthp = (BTHeaderRec *)((UInt8 *)buffer + offset);
+       bthp = (BTHeaderRec *)((u_int8_t *)buffer + offset);

        bthp->nodeSize     = nodesize;
        bthp->totalNodes   = btcb->totalNodes;
        bthp->freeNodes    = btcb->freeNodes;
        bthp->nodeSize     = nodesize;
        bthp->totalNodes   = btcb->totalNodes;
        bthp->freeNodes    = btcb->freeNodes;


@@ -701,21 +724,38 @@ hfs_create_attr_btree(struct hfsmount *hfsmp, uint32_t nodesize, uint32_t nodecn
        if (result)
                goto exit;
 
        if (result)
                goto exit;
 

-       /* Publish new btree file */
+       /* Update vp/cp for attribute btree */
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+       hfsmp->hfs_attribute_cp = VTOC(vp);

        hfsmp->hfs_attribute_vp = vp;
        hfsmp->hfs_attribute_vp = vp;

-       (void) hfs_flushvolumeheader(hfsmp, MNT_WAIT, HFS_ALTFLUSH);
+       lck_mtx_unlock(&hfsmp->hfs_mutex);

 
 

+       (void) hfs_flushvolumeheader(hfsmp, MNT_WAIT, HFS_ALTFLUSH);

 exit:
 exit:

-       hfs_unlock(VTOC(vp));
+       if (vp) {
+               hfs_unlock(VTOC(vp));
+       }

        if (result) {
                if (btcb) {
                        FREE (btcb, M_TEMP);
                }
        if (result) {
                if (btcb) {
                        FREE (btcb, M_TEMP);
                }

-               vnode_put(vp);
-       //      hfs_truncate();  /* XXX need to give back blocks */
+               if (vp) {
+                       vnode_put(vp);
+               }
+               /* XXX need to give back blocks ? */
+       }
+       if (intrans) {
+               hfs_end_transaction(hfsmp);

        }
        }

-       return (result);
-}

 
 

+       /*
+        * All done, clear HFS_CREATING_BTREE, and wake up any sleepers.
+        */
+       lck_mtx_lock(&hfsmp->hfs_mutex);
+       hfsmp->hfs_flags &= ~HFS_CREATING_BTREE;
+       wakeup((caddr_t)hfsmp->hfs_attribute_cp);
+       lck_mtx_unlock(&hfsmp->hfs_mutex);

 
 

+       return (result);
+}