xnu-792.6.22.tar.gz

[apple/xnu.git] / bsd / hfs / hfscommon / BTree / BTree.c

diff --git a/bsd/hfs/hfscommon/BTree/BTree.c b/bsd/hfs/hfscommon/BTree/BTree.c
index d61c73936cb373c2c87ab40b9b943159074a493d..9920c87422c2c7a5d2ee18e5fd398fcf8fbd1437 100644 (file)
--- a/bsd/hfs/hfscommon/BTree/BTree.c
+++ b/bsd/hfs/hfscommon/BTree/BTree.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @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,
- * 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@
  */
@@ -318,15 +315,12 @@ OSStatus BTOpenPath(FCB *filePtr, KeyCompareProcPtr keyCompareProc)
                }
        }
 
-       // if nodeSize Matches then we don't need to release, just CheckNode
-       if ( btreePtr->nodeSize == nodeRec.blockSize )
-       {
-               err = CheckNode (btreePtr, nodeRec.buffer);
-               if (err)
-                       VTOVCB(btreePtr->fileRefNum)->vcbFlags |= kHFS_DamagedVolume;
-               M_ExitOnError (err);
-       }
-       else
+       /*
+        * If the actual node size is different than the amount we read,
+        * then release and trash this block, and re-read with the correct
+        * node size.
+        */
+       if ( btreePtr->nodeSize != nodeRec.blockSize )
        {
                err = SetBTreeBlockSize (btreePtr->fileRefNum, btreePtr->nodeSize, 32);
                M_ExitOnError (err);
@@ -339,7 +333,7 @@ OSStatus BTOpenPath(FCB *filePtr, KeyCompareProcPtr keyCompareProc)
                ++btreePtr->numReleaseNodes;
                M_ExitOnError (err);
 
-               err = GetNode (btreePtr, kHeaderNodeNum, &nodeRec );            // calls CheckNode...
+               err = GetNode (btreePtr, kHeaderNodeNum, &nodeRec );
                M_ExitOnError (err);
        }
 
@@ -1123,7 +1117,7 @@ ProcessData:
        }
        
        while (err == 0) {
-               if (callBackProc(keyPtr, recordPtr, len, callBackState) == 0)
+               if (callBackProc(keyPtr, recordPtr, callBackState) == 0)
                        break;
                
                if ((index+1) < ((NodeDescPtr)node.buffer)->numRecords) {
@@ -1289,15 +1283,19 @@ OSStatus        BTInsertRecord          (FCB                                            *filePtr,
                                                                        goto ErrorExit;
                                                                }
 
-                                                               err = UpdateNode (btreePtr, &nodeRec, 0, kLockTransaction);
-                                                               M_ExitOnError (err);
-
-                                                               // update BTreeControlBlock
+                                                               /*
+                                                                * Update the B-tree control block.  Do this before
+                                                                * calling UpdateNode since it will compare the node's
+                                                                * height with treeDepth.
+                                                                */
                                                                btreePtr->treeDepth                     = 1;
                                                                btreePtr->rootNode                      = insertNodeNum;
                                                                btreePtr->firstLeafNode         = insertNodeNum;
                                                                btreePtr->lastLeafNode          = insertNodeNum;
 
+                                                               err = UpdateNode (btreePtr, &nodeRec, 0, kLockTransaction);
+                                                               M_ExitOnError (err);
+
                                                                M_BTreeHeaderDirty (btreePtr);
 
                                                                goto Success;
@@ -1551,7 +1549,7 @@ BTUpdateRecord(FCB *filePtr, BTreeIterator *iterator,
 
        btreePtr = (BTreeControlBlockPtr) filePtr->fcbBTCBPtr;
 
-       REQUIRE_FILE_LOCK(btreePtr->fileRefNum, false);
+       REQUIRE_FILE_LOCK(btreePtr->fileRefNum, true);
 
        ////////////////////////////// Take A Hint //////////////////////////////////
 
@@ -1574,7 +1572,7 @@ BTUpdateRecord(FCB *filePtr, BTreeIterator *iterator,
                                // XXXdbg
                                ModifyBlockStart(btreePtr->fileRefNum, &nodeRec);
                                                                
-                               err = callBackProc(keyPtr, recordPtr, recordLen, callBackState);
+                               err = callBackProc(keyPtr, recordPtr, callBackState);
                                M_ExitOnError (err);
 
                                err = UpdateNode (btreePtr, &nodeRec, 0, 0);
@@ -1609,7 +1607,7 @@ BTUpdateRecord(FCB *filePtr, BTreeIterator *iterator,
        // XXXdbg
        ModifyBlockStart(btreePtr->fileRefNum, &nodeRec);
                                                                
-       err = callBackProc(keyPtr, recordPtr, recordLen, callBackState);
+       err = callBackProc(keyPtr, recordPtr, callBackState);
        M_ExitOnError (err);
 
        err = UpdateNode (btreePtr, &nodeRec, 0, 0);
@@ -1789,7 +1787,7 @@ OSStatus  BTFlushPath                             (FCB                                    *filePtr)
 
        M_ReturnErrorIf (btreePtr == nil,       fsBTInvalidFileErr);
 
-       REQUIRE_FILE_LOCK(btreePtr->fileRefNum, false);
+       REQUIRE_FILE_LOCK(btreePtr->fileRefNum, true);
 
        err = UpdateHeader (btreePtr, false);