xnu-344.21.73.tar.gz

[apple/xnu.git] / bsd / hfs / hfscommon / Misc / FileExtentMapping.c

diff --git a/bsd/hfs/hfscommon/Misc/FileExtentMapping.c b/bsd/hfs/hfscommon/Misc/FileExtentMapping.c
index 3f17d760eacdf4b58f4817a928bef0dceaa55a47..7a38d6d71dc96bf74f961f8d6ce7f29f92efe43e 100644 (file)
--- a/bsd/hfs/hfscommon/Misc/FileExtentMapping.c
+++ b/bsd/hfs/hfscommon/Misc/FileExtentMapping.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.

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


@@ -237,16 +240,14 @@ Internal Routines:
                                        and was in the extents file, then delete the record instead.
 */
 
                                        and was in the extents file, then delete the record instead.
 */
 

+static const SInt64 kTwoGigabytes = 0x80000000LL;
+

 enum
 {
 enum
 {

-       kTwoGigabytes                   = (UInt32) 0x80000000,
-       

        kDataForkType                   = 0,
        kResourceForkType               = 0xFF,
        
        kDataForkType                   = 0,
        kResourceForkType               = 0xFF,
        

-       kPreviousRecord                 = -1,
-       
-       kSectorSize                             = 512           // Size of a physical sector
+       kPreviousRecord                 = -1

 };
 
 void HFSToHFSPlusExtents(
 };
 
 void HFSToHFSPlusExtents(


@@ -369,7 +370,7 @@ OSErr FindExtentRecord(
        UInt32                          *foundHint)
 {
        FCB *                           fcb;
        UInt32                          *foundHint)
 {
        FCB *                           fcb;

-       BTreeIterator           btIterator;
+       BTreeIterator           *btIterator;

        FSBufferDescriptor      btRecord;
        OSErr                           err;
        UInt16                          btRecordSize;
        FSBufferDescriptor      btRecord;
        OSErr                           err;
        UInt16                          btRecordSize;


@@ -378,13 +379,14 @@ OSErr FindExtentRecord(
        *foundHint = 0;
        fcb = GetFileControlBlock(vcb->extentsRefNum);
        
        *foundHint = 0;
        fcb = GetFileControlBlock(vcb->extentsRefNum);
        

-       (void) BTInvalidateHint(&btIterator);
+       MALLOC(btIterator, BTreeIterator *, sizeof(*btIterator), M_TEMP, M_WAITOK);
+       bzero(btIterator, sizeof(*btIterator));

 
        if (vcb->vcbSigWord == kHFSSigWord) {
                HFSExtentKey *          extentKeyPtr;
                HFSExtentRecord         extentData;
 
 
        if (vcb->vcbSigWord == kHFSSigWord) {
                HFSExtentKey *          extentKeyPtr;
                HFSExtentRecord         extentData;
 

-               extentKeyPtr = (HFSExtentKey*) &btIterator.key;
+               extentKeyPtr = (HFSExtentKey*) &btIterator->key;

                extentKeyPtr->keyLength = kHFSExtentKeyMaximumLength;
                extentKeyPtr->forkType = forkType;
                extentKeyPtr->fileID = fileID;
                extentKeyPtr->keyLength = kHFSExtentKeyMaximumLength;
                extentKeyPtr->forkType = forkType;
                extentKeyPtr->fileID = fileID;


@@ -394,10 +396,10 @@ OSErr FindExtentRecord(
                btRecord.itemSize = sizeof(HFSExtentRecord);
                btRecord.itemCount = 1;
 
                btRecord.itemSize = sizeof(HFSExtentRecord);
                btRecord.itemCount = 1;
 

-               err = BTSearchRecord(fcb, &btIterator, kInvalidMRUCacheKey, &btRecord, &btRecordSize, &btIterator);
+               err = BTSearchRecord(fcb, btIterator, &btRecord, &btRecordSize, btIterator);

 
                if (err == btNotFound && allowPrevious) {
 
                if (err == btNotFound && allowPrevious) {

-                       err = BTIterateRecord(fcb, kBTreePrevRecord, &btIterator, &btRecord, &btRecordSize);
+                       err = BTIterateRecord(fcb, kBTreePrevRecord, btIterator, &btRecord, &btRecordSize);

 
                        //      A previous record may not exist, so just return btNotFound (like we would if
                        //      it was for the wrong file/fork).
 
                        //      A previous record may not exist, so just return btNotFound (like we would if
                        //      it was for the wrong file/fork).


@@ -440,7 +442,7 @@ OSErr FindExtentRecord(
                HFSPlusExtentKey *      extentKeyPtr;
                HFSPlusExtentRecord     extentData;
 
                HFSPlusExtentKey *      extentKeyPtr;
                HFSPlusExtentRecord     extentData;
 

-               extentKeyPtr = (HFSPlusExtentKey*) &btIterator.key;
+               extentKeyPtr = (HFSPlusExtentKey*) &btIterator->key;

                extentKeyPtr->keyLength  = kHFSPlusExtentKeyMaximumLength;
                extentKeyPtr->forkType   = forkType;
                extentKeyPtr->pad                = 0;
                extentKeyPtr->keyLength  = kHFSPlusExtentKeyMaximumLength;
                extentKeyPtr->forkType   = forkType;
                extentKeyPtr->pad                = 0;


@@ -451,10 +453,10 @@ OSErr FindExtentRecord(
                btRecord.itemSize = sizeof(HFSPlusExtentRecord);
                btRecord.itemCount = 1;
 
                btRecord.itemSize = sizeof(HFSPlusExtentRecord);
                btRecord.itemCount = 1;
 

-               err = BTSearchRecord(fcb, &btIterator, kInvalidMRUCacheKey, &btRecord, &btRecordSize, &btIterator);
+               err = BTSearchRecord(fcb, btIterator, &btRecord, &btRecordSize, btIterator);

 
                if (err == btNotFound && allowPrevious) {
 
                if (err == btNotFound && allowPrevious) {

-                       err = BTIterateRecord(fcb, kBTreePrevRecord, &btIterator, &btRecord, &btRecordSize);
+                       err = BTIterateRecord(fcb, kBTreePrevRecord, btIterator, &btRecord, &btRecordSize);

 
                        //      A previous record may not exist, so just return btNotFound (like we would if
                        //      it was for the wrong file/fork).
 
                        //      A previous record may not exist, so just return btNotFound (like we would if
                        //      it was for the wrong file/fork).


@@ -476,7 +478,8 @@ OSErr FindExtentRecord(
                }
        }
        
                }
        }
        

-       *foundHint = btIterator.hint.nodeNum;
+       *foundHint = btIterator->hint.nodeNum;
+       FREE(btIterator, M_TEMP);       

        return err;
 }
 
        return err;
 }
 


@@ -488,14 +491,21 @@ static OSErr CreateExtentRecord(
        HFSPlusExtentRecord     extents,
        UInt32                          *hint)
 {
        HFSPlusExtentRecord     extents,
        UInt32                          *hint)
 {

-       BTreeIterator           btIterator;
+       BTreeIterator * btIterator;

        FSBufferDescriptor      btRecord;
        UInt16                          btRecordSize;
        OSErr                           err;
        
        err = noErr;
        *hint = 0;
        FSBufferDescriptor      btRecord;
        UInt16                          btRecordSize;
        OSErr                           err;
        
        err = noErr;
        *hint = 0;

-       (void) BTInvalidateHint(&btIterator);
+
+       // XXXdbg - preflight that there's enough space
+       err = BTCheckFreeSpace(GetFileControlBlock(vcb->extentsRefNum));
+       if (err)
+               return err;
+
+       MALLOC(btIterator, BTreeIterator *, sizeof(*btIterator), M_TEMP, M_WAITOK);
+       bzero(btIterator, sizeof(*btIterator));

        
        if (vcb->vcbSigWord == kHFSSigWord) {
                HFSExtentKey *          keyPtr;
        
        if (vcb->vcbSigWord == kHFSSigWord) {
                HFSExtentKey *          keyPtr;


@@ -506,7 +516,7 @@ static OSErr CreateExtentRecord(
                btRecord.itemSize = btRecordSize;
                btRecord.itemCount = 1;
 
                btRecord.itemSize = btRecordSize;
                btRecord.itemCount = 1;
 

-               keyPtr = (HFSExtentKey*) &btIterator.key;
+               keyPtr = (HFSExtentKey*) &btIterator->key;

                keyPtr->keyLength       = kHFSExtentKeyMaximumLength;
                keyPtr->forkType        = key->forkType;
                keyPtr->fileID          = key->fileID;
                keyPtr->keyLength       = kHFSExtentKeyMaximumLength;
                keyPtr->forkType        = key->forkType;
                keyPtr->fileID          = key->fileID;


@@ -520,15 +530,18 @@ static OSErr CreateExtentRecord(
                btRecord.itemSize = btRecordSize;
                btRecord.itemCount = 1;
 
                btRecord.itemSize = btRecordSize;
                btRecord.itemCount = 1;
 

-               BlockMoveData(key, &btIterator.key, sizeof(HFSPlusExtentKey));
+               BlockMoveData(key, &btIterator->key, sizeof(HFSPlusExtentKey));

        }
 
        if (err == noErr)
        }
 
        if (err == noErr)

-               err = BTInsertRecord(GetFileControlBlock(vcb->extentsRefNum), &btIterator, &btRecord, btRecordSize);
+               err = BTInsertRecord(GetFileControlBlock(vcb->extentsRefNum), btIterator, &btRecord, btRecordSize);

 
        if (err == noErr)
 
        if (err == noErr)

-               *hint = btIterator.hint.nodeNum;
+               *hint = btIterator->hint.nodeNum;

 
 

+       (void) BTFlushPath(GetFileControlBlock(vcb->extentsRefNum));
+       
+       FREE(btIterator, M_TEMP);       

        return err;
 }
 
        return err;
 }
 


@@ -539,16 +552,23 @@ OSErr DeleteExtentRecord(
        UInt32                          fileID,
        UInt32                          startBlock)
 {
        UInt32                          fileID,
        UInt32                          startBlock)
 {

-       BTreeIterator           btIterator;
+       BTreeIterator * btIterator;

        OSErr                           err;
        
        err = noErr;
        OSErr                           err;
        
        err = noErr;

-       (void) BTInvalidateHint(&btIterator);
+
+       // XXXdbg - preflight that there's enough space
+       err = BTCheckFreeSpace(GetFileControlBlock(vcb->extentsRefNum));
+       if (err)
+               return err;
+
+       MALLOC(btIterator, BTreeIterator *, sizeof(*btIterator), M_TEMP, M_WAITOK);
+       bzero(btIterator, sizeof(*btIterator));

        
        if (vcb->vcbSigWord == kHFSSigWord) {
                HFSExtentKey *  keyPtr;
 
        
        if (vcb->vcbSigWord == kHFSSigWord) {
                HFSExtentKey *  keyPtr;
 

-               keyPtr = (HFSExtentKey*) &btIterator.key;
+               keyPtr = (HFSExtentKey*) &btIterator->key;

                keyPtr->keyLength       = kHFSExtentKeyMaximumLength;
                keyPtr->forkType        = forkType;
                keyPtr->fileID          = fileID;
                keyPtr->keyLength       = kHFSExtentKeyMaximumLength;
                keyPtr->forkType        = forkType;
                keyPtr->fileID          = fileID;


@@ -557,7 +577,7 @@ OSErr DeleteExtentRecord(
        else {          //      HFS Plus volume
                HFSPlusExtentKey *      keyPtr;
 
        else {          //      HFS Plus volume
                HFSPlusExtentKey *      keyPtr;
 

-               keyPtr = (HFSPlusExtentKey*) &btIterator.key;
+               keyPtr = (HFSPlusExtentKey*) &btIterator->key;

                keyPtr->keyLength       = kHFSPlusExtentKeyMaximumLength;
                keyPtr->forkType        = forkType;
                keyPtr->pad                     = 0;
                keyPtr->keyLength       = kHFSPlusExtentKeyMaximumLength;
                keyPtr->forkType        = forkType;
                keyPtr->pad                     = 0;


@@ -565,8 +585,10 @@ OSErr DeleteExtentRecord(
                keyPtr->startBlock      = startBlock;
        }
 
                keyPtr->startBlock      = startBlock;
        }
 

-       err = BTDeleteRecord(GetFileControlBlock(vcb->extentsRefNum), &btIterator);
+       err = BTDeleteRecord(GetFileControlBlock(vcb->extentsRefNum), btIterator);
+       (void) BTFlushPath(GetFileControlBlock(vcb->extentsRefNum));

        
        

+       FREE(btIterator, M_TEMP);       

        return err;
 }
 
        return err;
 }
 


@@ -599,11 +621,12 @@ OSErr MapFileBlockC (
        FCB                             *fcb,                           // FCB of file
        size_t                  numberOfBytes,          // number of contiguous bytes desired
        off_t                   offset,                         // starting offset within file (in bytes)
        FCB                             *fcb,                           // FCB of file
        size_t                  numberOfBytes,          // number of contiguous bytes desired
        off_t                   offset,                         // starting offset within file (in bytes)

-       daddr_t                 *startSector,           // first 512-byte sector (NOT an allocation block)
+       daddr_t                 *startSector,           // first sector (NOT an allocation block)

        size_t                  *availableBytes)        // number of contiguous bytes (up to numberOfBytes)
 {
        OSErr                           err;
        UInt32                          allocBlockSize;                 //      Size of the volume's allocation block
        size_t                  *availableBytes)        // number of contiguous bytes (up to numberOfBytes)
 {
        OSErr                           err;
        UInt32                          allocBlockSize;                 //      Size of the volume's allocation block

+       UInt32                  sectorSize;

        HFSPlusExtentKey        foundKey;
        HFSPlusExtentRecord     foundData;
        UInt32                          foundIndex;
        HFSPlusExtentKey        foundKey;
        HFSPlusExtentRecord     foundData;
        UInt32                          foundIndex;


@@ -617,6 +640,7 @@ OSErr MapFileBlockC (
        off_t                           tmpOff;
 
        allocBlockSize = vcb->blockSize;
        off_t                           tmpOff;
 
        allocBlockSize = vcb->blockSize;

+       sectorSize = VCBTOHFS(vcb)->hfs_phys_block_size;

        
        err = SearchExtentFile(vcb, fcb, offset, &foundKey, foundData, &foundIndex, &hint, &nextFABN);
        if (err == noErr) {
        
        err = SearchExtentFile(vcb, fcb, offset, &foundKey, foundData, &foundIndex, &hint, &nextFABN);
        if (err == noErr) {


@@ -633,22 +657,26 @@ OSErr MapFileBlockC (
        //      Determine the end of the available space.  It will either be the end of the extent,
        //      or the file's PEOF, whichever is smaller.
        //
        //      Determine the end of the available space.  It will either be the end of the extent,
        //      or the file's PEOF, whichever is smaller.
        //

-       dataEnd = (off_t)((off_t)(nextFABN) * (off_t)(allocBlockSize));         // Assume valid data through end of this extent
-       if (fcb->fcbPLen < dataEnd)                                     // Is PEOF shorter?
-               dataEnd = fcb->fcbPLen;                                 // Yes, so only map up to PEOF
+       dataEnd = (off_t)((off_t)(nextFABN) * (off_t)(allocBlockSize));   // Assume valid data through end of this extent
+       if (((off_t)fcb->ff_blocks * (off_t)allocBlockSize) < dataEnd)    // Is PEOF shorter?
+               dataEnd = (off_t)fcb->ff_blocks * (off_t)allocBlockSize;  // Yes, so only map up to PEOF

        
        //      Compute the number of sectors in an allocation block
        
        //      Compute the number of sectors in an allocation block

-       sectorsPerBlock = allocBlockSize / kSectorSize; // sectors per allocation block
+       sectorsPerBlock = allocBlockSize / sectorSize;  // sectors per allocation block

        
        //
        //      Compute the absolute sector number that contains the offset of the given file
        
        //
        //      Compute the absolute sector number that contains the offset of the given file

+       //      offset in sectors from start of the extent +
+       //      offset in sectors from start of allocation block space

        //
        //

-       temp = (daddr_t)((offset - (off_t)((off_t)(firstFABN) * (off_t)(allocBlockSize)))/kSectorSize); // offset in sectors from start of the extent
-       temp += startBlock * sectorsPerBlock;                   // offset in sectors from start of allocation block space
-    if (vcb->vcbSigWord == kHFSPlusSigWord)
-        temp += vcb->hfsPlusIOPosOffset/512;  /* offset inside wrapper */
-    else
-        temp += vcb->vcbAlBlSt;                /* offset in sectors from start of volume */
+       temp = (daddr_t)((offset - (off_t)((off_t)(firstFABN) * (off_t)(allocBlockSize)))/sectorSize);
+       temp += startBlock * sectorsPerBlock;
+
+       /* Add in any volume offsets */
+       if (vcb->vcbSigWord == kHFSPlusSigWord)
+               temp += vcb->hfsPlusIOPosOffset / sectorSize;
+       else
+               temp += vcb->vcbAlBlSt;

        
        //      Return the desired sector for file position "offset"
        *startSector = temp;
        
        //      Return the desired sector for file position "offset"
        *startSector = temp;


@@ -810,81 +838,16 @@ OSErr FlushExtentFile( ExtendedVCB *vcb )
        {
                // If the FCB for the extent "file" is dirty, mark the VCB as dirty.
                
        {
                // If the FCB for the extent "file" is dirty, mark the VCB as dirty.
                

-        if ((fcb->fcbFlags & fcbModifiedMask) != 0)
+        if (FTOC(fcb)->c_flag & C_MODIFIED)

                {
                        MarkVCBDirty( vcb );
                {
                        MarkVCBDirty( vcb );

-                       err = FlushVolumeControlBlock( vcb );
+               //      err = FlushVolumeControlBlock( vcb );

                }
        }
        
        return( err );
 }
 
                }
        }
        
        return( err );
 }
 

-//-------------------------------------------------------------------------------
-//     Routine:        DeleteFile
-//
-//     Function:       De-allocates all disk space allocated to a specified file 
-//                             including the space used by the catalog (ie the catalog record).
-//                             The space occupied by both forks is also deallocated.
-//
-//-------------------------------------------------------------------------------
-
-OSErr DeleteFile( ExtendedVCB *vcb, HFSCatalogNodeID parDirID, ConstUTF8Param catalogName, UInt32 catalogHint )
-{
-       OSErr                   err;
-       OSErr                   errDF, errRF;
-       CatalogNodeData catalogData;
-       Boolean                 recordDeleted;
-       
-       recordDeleted = false;
-       
-       INIT_CATALOGDATA(&catalogData, kCatNameNoCopyName);
-       
-       // Find catalog data in catalog
-    err = GetCatalogNode( vcb, parDirID, catalogName, kUndefinedStrLen, catalogHint, &catalogData, &catalogHint);
-       if( err != noErr )
-               goto Exit;
-
-       
-       // Check to make sure record is for a file
-       if ( catalogData.cnd_type != kCatalogFileNode )
-       {
-               err = notAFileErr;
-               goto Exit;
-       }
-       
-       //
-       // Always delete the Catalog record first (to minimize disk corruption)
-       //
-       err = DeleteCatalogNode(vcb, parDirID, catalogName, catalogHint);
-       if( err != noErr )
-               goto Exit;
-
-       //
-       // Note: we don't report errors from DeallocateFork since the
-       // file no longer exists (since DeleteCatalogNode succeeded).
-       // Any errors mean that there are possibly some orphaned disk
-       // blocks but from the clients perspective the file was deleted.
-       //
-
-       // Deallocate data fork extents
-       errDF = DeallocateFork( vcb, catalogData.cnd_nodeID, kDataForkType,
-                   catalogData.cnd_datafork.extents, &recordDeleted );
-
-       // Deallocate resource fork extents
-       errRF = DeallocateFork( vcb, catalogData.cnd_nodeID, kResourceForkType,
-                   catalogData.cnd_rsrcfork.extents, &recordDeleted );
-
-       if (recordDeleted)
-               err = FlushExtentFile( vcb );
-
-       CLEAN_CATALOGDATA(&catalogData);
-       return (errDF ? errDF : (errRF ? errRF : err));
-Exit:
-       
-       CLEAN_CATALOGDATA(&catalogData);
-       return( err );
-}

 
 //\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b
 //     Routine:        CompareExtentKeys
 
 //\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b\8b
 //     Routine:        CompareExtentKeys


@@ -1064,7 +1027,7 @@ OSErr ExtendFileC (
        UInt32                          numExtentsPerRecord;
        SInt64                          maximumBytes;
        SInt64                          peof;
        UInt32                          numExtentsPerRecord;
        SInt64                          maximumBytes;
        SInt64                          peof;

-       SInt64                          previousPEOF;
+       UInt32                          prevblocks;

        
 
        needsFlush = false;
        
 
        needsFlush = false;


@@ -1072,7 +1035,7 @@ OSErr ExtendFileC (
        volumeBlockSize = vcb->blockSize;
        allOrNothing = ((flags & kEFAllMask) != 0);
        forceContig = ((flags & kEFContigMask) != 0);
        volumeBlockSize = vcb->blockSize;
        allOrNothing = ((flags & kEFAllMask) != 0);
        forceContig = ((flags & kEFContigMask) != 0);

-       previousPEOF = fcb->fcbPLen;
+       prevblocks = fcb->ff_blocks;

 
        if (vcb->vcbSigWord == kHFSPlusSigWord)
                numExtentsPerRecord = kHFSPlusExtentDensity;
 
        if (vcb->vcbSigWord == kHFSPlusSigWord)
                numExtentsPerRecord = kHFSPlusExtentDensity;


@@ -1085,33 +1048,63 @@ OSErr ExtendFileC (
        if (vcb->vcbSigWord == kHFSSigWord) {
                if (bytesToAdd >=  kTwoGigabytes)
                        goto Overflow;
        if (vcb->vcbSigWord == kHFSSigWord) {
                if (bytesToAdd >=  kTwoGigabytes)
                        goto Overflow;

-               if ((fcb->fcbPLen + bytesToAdd) >= kTwoGigabytes)
+               if ((((SInt64)fcb->ff_blocks * (SInt64)volumeBlockSize) + bytesToAdd) >= kTwoGigabytes)

                        goto Overflow;
                        goto Overflow;

-               }
+       }

        //
        //      Determine how many blocks need to be allocated.
        //      Round up the number of desired bytes to add.
        //
        blocksToAdd = FileBytesToBlocks(bytesToAdd, volumeBlockSize);
        bytesToAdd = (SInt64)((SInt64)blocksToAdd * (SInt64)volumeBlockSize);
        //
        //      Determine how many blocks need to be allocated.
        //      Round up the number of desired bytes to add.
        //
        blocksToAdd = FileBytesToBlocks(bytesToAdd, volumeBlockSize);
        bytesToAdd = (SInt64)((SInt64)blocksToAdd * (SInt64)volumeBlockSize);

-       
+
+       /*
+        * For deferred allocations just reserve the blocks.
+        */
+       if ((flags & kEFDeferMask)
+       &&  (vcb->vcbSigWord == kHFSPlusSigWord)
+       &&  (bytesToAdd < (SInt64)HFS_MAX_DEFERED_ALLOC)
+       &&  (blocksToAdd < hfs_freeblks(VCBTOHFS(vcb), 1))) {
+               fcb->ff_unallocblocks += blocksToAdd;
+               vcb->loanedBlocks     += blocksToAdd;
+               FTOC(fcb)->c_blocks   += blocksToAdd;
+               fcb->ff_blocks        += blocksToAdd;
+
+               FTOC(fcb)->c_flag |= C_MODIFIED;
+               *actualBytesAdded = bytesToAdd;
+               return (0);
+       }
+       /* 
+        * Give back any unallocated blocks before doing real allocations.
+        */
+       if (fcb->ff_unallocblocks > 0) {
+               blocksToAdd += fcb->ff_unallocblocks;
+               bytesToAdd = (SInt64)blocksToAdd * (SInt64)volumeBlockSize;
+
+               vcb->loanedBlocks     -= fcb->ff_unallocblocks;
+               FTOC(fcb)->c_blocks   -= fcb->ff_unallocblocks;
+               fcb->ff_blocks        -= fcb->ff_unallocblocks;
+               fcb->ff_unallocblocks  = 0;
+       }
+

        //
        //      If the file's clump size is larger than the allocation block size,
        //      then set the maximum number of bytes to the requested number of bytes
        //      rounded up to a multiple of the clump size.
        //
        //
        //      If the file's clump size is larger than the allocation block size,
        //      then set the maximum number of bytes to the requested number of bytes
        //      rounded up to a multiple of the clump size.
        //

-       if (fcb->fcbClmpSize > volumeBlockSize) {
+       if ((fcb->fcbClmpSize > volumeBlockSize)
+       &&  (bytesToAdd < (SInt64)HFS_MAX_DEFERED_ALLOC)
+       &&  (flags & kEFNoClumpMask) == 0) {

                maximumBytes = (SInt64)FileBytesToBlocks(bytesToAdd, fcb->fcbClmpSize);
                maximumBytes *= fcb->fcbClmpSize;
                maximumBytes = (SInt64)FileBytesToBlocks(bytesToAdd, fcb->fcbClmpSize);
                maximumBytes *= fcb->fcbClmpSize;

-       }
-       else {
+       } else {

                maximumBytes = bytesToAdd;
        }
        
        //
        //      Compute new physical EOF, rounded up to a multiple of a block.
        //
                maximumBytes = bytesToAdd;
        }
        
        //
        //      Compute new physical EOF, rounded up to a multiple of a block.
        //

-       if ((vcb->vcbSigWord == kHFSSigWord) && ((fcb->fcbPLen + bytesToAdd) >= (SInt64) kTwoGigabytes))        //      Too big?
+       if ((vcb->vcbSigWord == kHFSSigWord) && ((((SInt64)fcb->ff_blocks * (SInt64)volumeBlockSize) + bytesToAdd) >= kTwoGigabytes))   //      Too big?

                if (allOrNothing)                                       // Yes, must they have it all?
                        goto Overflow;                                          // Yes, can't have it
                else {
                if (allOrNothing)                                       // Yes, must they have it all?
                        goto Overflow;                                          // Yes, can't have it
                else {


@@ -1123,7 +1116,8 @@ OSErr ExtendFileC (
        //      If allocation is all-or-nothing, make sure there are
        //      enough free blocks on the volume (quick test).
        //
        //      If allocation is all-or-nothing, make sure there are
        //      enough free blocks on the volume (quick test).
        //

-       if (allOrNothing && (blocksToAdd > (SInt64)vcb->freeBlocks)) {
+       if (allOrNothing &&
+           (blocksToAdd > hfs_freeblks(VCBTOHFS(vcb), flags & kEFReserveMask))) {

                err = dskFulErr;
                goto ErrorExit;
        }
                err = dskFulErr;
                goto ErrorExit;
        }


@@ -1131,13 +1125,13 @@ OSErr ExtendFileC (
        //
        //      See if there are already enough blocks allocated to the file.
        //
        //
        //      See if there are already enough blocks allocated to the file.
        //

-       peof = fcb->fcbPLen + bytesToAdd;                       // potential new PEOF
+       peof = ((SInt64)fcb->ff_blocks * (SInt64)volumeBlockSize) + bytesToAdd;  // potential new PEOF

        err = SearchExtentFile(vcb, fcb, peof-1, &foundKey, foundData, &foundIndex, &hint, &nextBlock);
        if (err == noErr) {
                //      Enough blocks are already allocated.  Just update the FCB to reflect the new length.
        err = SearchExtentFile(vcb, fcb, peof-1, &foundKey, foundData, &foundIndex, &hint, &nextBlock);
        if (err == noErr) {
                //      Enough blocks are already allocated.  Just update the FCB to reflect the new length.

-               fcb->fcbPLen = peof;
-               H_EXTENDSIZE(fcb, bytesToAdd);
-               fcb->fcbFlags |= fcbModifiedMask;
+               fcb->ff_blocks = peof / volumeBlockSize;
+               FTOC(fcb)->c_blocks += (bytesToAdd / volumeBlockSize);
+               FTOC(fcb)->c_flag |= C_MODIFIED;

                goto Exit;
        }
        if (err != fxRangeErr)          // Any real error?
                goto Exit;
        }
        if (err != fxRangeErr)          // Any real error?


@@ -1147,11 +1141,11 @@ OSErr ExtendFileC (
        //      Adjust the PEOF to the end of the last extent.
        //
        peof = (SInt64)((SInt64)nextBlock * (SInt64)volumeBlockSize);                   // currently allocated PEOF
        //      Adjust the PEOF to the end of the last extent.
        //
        peof = (SInt64)((SInt64)nextBlock * (SInt64)volumeBlockSize);                   // currently allocated PEOF

-       bytesThisExtent = peof - fcb->fcbPLen;
+       bytesThisExtent = (SInt64)(nextBlock - fcb->ff_blocks) * (SInt64)volumeBlockSize;

        if (bytesThisExtent != 0) {
        if (bytesThisExtent != 0) {

-               fcb->fcbPLen = peof;
-               H_EXTENDSIZE(fcb, bytesThisExtent);
-               fcb->fcbFlags |= fcbModifiedMask;
+               fcb->ff_blocks = nextBlock;
+               FTOC(fcb)->c_blocks += (bytesThisExtent / volumeBlockSize);
+               FTOC(fcb)->c_flag |= C_MODIFIED;

                bytesToAdd -= bytesThisExtent;
        }
        
                bytesToAdd -= bytesThisExtent;
        }
        


@@ -1170,7 +1164,36 @@ OSErr ExtendFileC (
                        startBlock = blockHint;
                else
                        startBlock = foundData[foundIndex].startBlock + foundData[foundIndex].blockCount;
                        startBlock = blockHint;
                else
                        startBlock = foundData[foundIndex].startBlock + foundData[foundIndex].blockCount;

-               err = BlockAllocate(vcb, startBlock, bytesToAdd, maximumBytes, wantContig, &actualStartBlock, &actualNumBlocks);
+
+               /* Force reserve checking if requested. */
+               if (flags & kEFReserveMask) {
+                       SInt64 availbytes;
+
+                       actualNumBlocks = 0;
+                       actualStartBlock = 0;
+                       
+                       availbytes = (SInt64)hfs_freeblks(VCBTOHFS(vcb), 1) *
+                                    (SInt64)volumeBlockSize;
+                       if (availbytes <= 0) {
+                               err = dskFulErr;
+                       } else {
+                               if (wantContig && (availbytes < bytesToAdd))
+                                       err = dskFulErr;
+                               else {
+                                       err = BlockAllocate(
+                                                 vcb,
+                                                 startBlock,
+                                                 MIN(bytesToAdd, availbytes),
+                                                 MIN(maximumBytes, availbytes),
+                                                 wantContig,
+                                                 &actualStartBlock,
+                                                 &actualNumBlocks);
+                               }
+                       }
+               } else {
+                       err = BlockAllocate(vcb, startBlock, bytesToAdd, maximumBytes,
+                                       wantContig, &actualStartBlock, &actualNumBlocks);
+               }

                if (err == dskFulErr) {
                        if (forceContig)
                                break;                  // AllocContig failed because not enough contiguous space
                if (err == dskFulErr) {
                        if (forceContig)
                                break;                  // AllocContig failed because not enough contiguous space


@@ -1199,19 +1222,19 @@ OSErr ExtendFileC (
                                        ++foundIndex;                                                   //      No, so use the next one.
                                if (foundIndex == numExtentsPerRecord) {
                                        //      This record is full.  Need to create a new one.
                                        ++foundIndex;                                                   //      No, so use the next one.
                                if (foundIndex == numExtentsPerRecord) {
                                        //      This record is full.  Need to create a new one.

-                                       if (H_FILEID(fcb) == kHFSExtentsFileID) {
+                                       if (FTOC(fcb)->c_fileid == kHFSExtentsFileID) {

                                                (void) BlockDeallocate(vcb, actualStartBlock, actualNumBlocks);
                                                err = dskFulErr;                // Oops.  Can't extend extents file past first record.
                                                break;
                                        }
                                        
                                        foundKey.keyLength = kHFSPlusExtentKeyMaximumLength;
                                                (void) BlockDeallocate(vcb, actualStartBlock, actualNumBlocks);
                                                err = dskFulErr;                // Oops.  Can't extend extents file past first record.
                                                break;
                                        }
                                        
                                        foundKey.keyLength = kHFSPlusExtentKeyMaximumLength;

-                                       if (fcb->fcbFlags & fcbResourceMask)
+                                       if (FORK_IS_RSRC(fcb))

                                                foundKey.forkType = kResourceForkType;
                                        else
                                                foundKey.forkType = kDataForkType;
                                        foundKey.pad = 0;
                                                foundKey.forkType = kResourceForkType;
                                        else
                                                foundKey.forkType = kDataForkType;
                                        foundKey.pad = 0;

-                                       foundKey.fileID = H_FILEID(fcb);
+                                       foundKey.fileID = FTOC(fcb)->c_fileid;

                                        foundKey.startBlock = nextBlock;
                                        
                                        foundData[0].startBlock = actualStartBlock;
                                        foundKey.startBlock = nextBlock;
                                        
                                        foundData[0].startBlock = actualStartBlock;


@@ -1259,9 +1282,9 @@ OSErr ExtendFileC (
                                bytesToAdd -= bytesThisExtent;
                                maximumBytes -= bytesThisExtent;
                        }
                                bytesToAdd -= bytesThisExtent;
                                maximumBytes -= bytesThisExtent;
                        }

-            fcb->fcbPLen += bytesThisExtent;
-            H_EXTENDSIZE(fcb, bytesThisExtent);
-                       fcb->fcbFlags |= fcbModifiedMask;
+                       fcb->ff_blocks += (bytesThisExtent / volumeBlockSize);
+                       FTOC(fcb)->c_blocks += (bytesThisExtent / volumeBlockSize);
+                       FTOC(fcb)->c_flag |= C_MODIFIED;

 
                        //      If contiguous allocation was requested, then we've already got one contiguous
                        //      chunk.  If we didn't get all we wanted, then adjust the error to disk full.
 
                        //      If contiguous allocation was requested, then we've already got one contiguous
                        //      chunk.  If we didn't get all we wanted, then adjust the error to disk full.


@@ -1275,7 +1298,7 @@ OSErr ExtendFileC (
 
 ErrorExit:
 Exit:
 
 ErrorExit:
 Exit:

-       *actualBytesAdded = fcb->fcbPLen - previousPEOF;
+       *actualBytesAdded = (SInt64)(fcb->ff_blocks - prevblocks) * (SInt64)volumeBlockSize;

 
        if (needsFlush)
                (void) FlushExtentFile(vcb);
 
        if (needsFlush)
                (void) FlushExtentFile(vcb);


@@ -1342,12 +1365,12 @@ OSErr TruncateFileC (
        else
                numExtentsPerRecord = kHFSExtentDensity;
 
        else
                numExtentsPerRecord = kHFSExtentDensity;
 

-       if (fcb->fcbFlags & fcbResourceMask)
+       if (FORK_IS_RSRC(fcb))

                forkType = kResourceForkType;
        else
                forkType = kDataForkType;
 
                forkType = kResourceForkType;
        else
                forkType = kDataForkType;
 

-       temp64 = fcb->fcbPLen / (SInt64)vcb->blockSize;         // number of allocation blocks currently in file
+       temp64 = fcb->ff_blocks;

        physNumBlocks = (UInt32)temp64;
 
        //
        physNumBlocks = (UInt32)temp64;
 
        //


@@ -1357,7 +1380,7 @@ OSErr TruncateFileC (
        //
        nextBlock = FileBytesToBlocks(peof, vcb->blockSize);    // number of allocation blocks to remain in file
        peof = (SInt64)((SInt64)nextBlock * (SInt64)vcb->blockSize);                                    // number of bytes in those blocks
        //
        nextBlock = FileBytesToBlocks(peof, vcb->blockSize);    // number of allocation blocks to remain in file
        peof = (SInt64)((SInt64)nextBlock * (SInt64)vcb->blockSize);                                    // number of bytes in those blocks

-       if ((vcb->vcbSigWord == kHFSSigWord) && (peof >= (UInt32) kTwoGigabytes)) {
+       if ((vcb->vcbSigWord == kHFSSigWord) && (peof >= kTwoGigabytes)) {

                #if DEBUG_BUILD
                        DebugStr("\pHFS: Trying to truncate a file to 2GB or more");
                #endif
                #if DEBUG_BUILD
                        DebugStr("\pHFS: Trying to truncate a file to 2GB or more");
                #endif


@@ -1368,9 +1391,10 @@ OSErr TruncateFileC (
        //
        //      Update FCB's length
        //
        //
        //      Update FCB's length
        //

-       H_TRUNCSIZE(fcb, fcb->fcbPLen - peof);
-       fcb->fcbPLen = peof;
-       fcb->fcbFlags |= fcbModifiedMask;
+       numBlocks = peof / vcb->blockSize;
+       FTOC(fcb)->c_blocks -= (fcb->ff_blocks - numBlocks);
+       fcb->ff_blocks = numBlocks;
+       FTOC(fcb)->c_flag |= C_MODIFIED;

        
        //
        //      If the new PEOF is 0, then truncateToExtent has no meaning (we should always deallocate
        
        //
        //      If the new PEOF is 0, then truncateToExtent has no meaning (we should always deallocate


@@ -1380,7 +1404,7 @@ OSErr TruncateFileC (
                int i;
                
                //      Deallocate all the extents for this fork
                int i;
                
                //      Deallocate all the extents for this fork

-               err = DeallocateFork(vcb, H_FILEID(fcb), forkType, fcb->fcbExtents, &recordDeleted);
+               err = DeallocateFork(vcb, FTOC(fcb)->c_fileid, forkType, fcb->fcbExtents, &recordDeleted);

                if (err != noErr) goto ErrorExit;       //      got some error, so return it
                
                //      Update the catalog extent record (making sure it's zeroed out)
                if (err != noErr) goto ErrorExit;       //      got some error, so return it
                
                //      Update the catalog extent record (making sure it's zeroed out)


@@ -1466,7 +1490,7 @@ OSErr TruncateFileC (
        //      blocks.
        //
        if (nextBlock < physNumBlocks)
        //      blocks.
        //
        if (nextBlock < physNumBlocks)

-               err = TruncateExtents(vcb, forkType, H_FILEID(fcb), nextBlock, &recordDeleted);
+               err = TruncateExtents(vcb, forkType, FTOC(fcb)->c_fileid, nextBlock, &recordDeleted);

 
 Done:
 ErrorExit:
 
 Done:
 ErrorExit:


@@ -1648,8 +1672,8 @@ static OSErr SearchExtentFile(
        //
        //      Find the desired record, or the previous record if it is the same fork
        //
        //
        //      Find the desired record, or the previous record if it is the same fork
        //

-       err = FindExtentRecord(vcb, (fcb->fcbFlags & fcbResourceMask) ? kResourceForkType : kDataForkType,
-                                                  H_FILEID(fcb), filePositionBlock, true, foundExtentKey, foundExtentData, extentBTreeHint);
+       err = FindExtentRecord(vcb, FORK_IS_RSRC(fcb) ? kResourceForkType : kDataForkType,
+                                                  FTOC(fcb)->c_fileid, filePositionBlock, true, foundExtentKey, foundExtentData, extentBTreeHint);

 
        if (err == btNotFound) {
                //
 
        if (err == btNotFound) {
                //


@@ -1708,68 +1732,78 @@ static OSErr UpdateExtentRecord (
        const HFSPlusExtentRecord       extentData,
        UInt32                                  extentBTreeHint)
 {
        const HFSPlusExtentRecord       extentData,
        UInt32                                  extentBTreeHint)
 {

-       BTreeIterator           btIterator;
-       FSBufferDescriptor      btRecord;
-       UInt16                          btRecordSize;
-       FCB *                           btFCB;
-    OSErr                              err = noErr;
+    OSErr err = noErr;

        
        if (extentFileKey->keyLength == 0) {    // keyLength == 0 means the FCB's extent record
                BlockMoveData(extentData, fcb->fcbExtents, sizeof(HFSPlusExtentRecord));
        
        if (extentFileKey->keyLength == 0) {    // keyLength == 0 means the FCB's extent record
                BlockMoveData(extentData, fcb->fcbExtents, sizeof(HFSPlusExtentRecord));

-               fcb->fcbFlags |= fcbModifiedMask;
+               FTOC(fcb)->c_flag |= C_MODIFIED;

        }
        else {
        }
        else {

+               BTreeIterator * btIterator;
+               FSBufferDescriptor btRecord;
+               UInt16 btRecordSize;
+               FCB * btFCB;
+

                //
                //      Need to find and change a record in Extents BTree
                //
                btFCB = GetFileControlBlock(vcb->extentsRefNum);
 
                //
                //      Need to find and change a record in Extents BTree
                //
                btFCB = GetFileControlBlock(vcb->extentsRefNum);
 

+               // XXXdbg - preflight that there's enough space
+               err = BTCheckFreeSpace(btFCB);
+               if (err)
+                       return err;
+
+               MALLOC(btIterator, BTreeIterator *, sizeof(*btIterator), M_TEMP, M_WAITOK);
+               bzero(btIterator, sizeof(*btIterator));
+

                if (vcb->vcbSigWord == kHFSSigWord) {
                        HFSExtentKey *  key;                            // Actual extent key used on disk in HFS
                        HFSExtentRecord foundData;                      // The extent data actually found
 
                if (vcb->vcbSigWord == kHFSSigWord) {
                        HFSExtentKey *  key;                            // Actual extent key used on disk in HFS
                        HFSExtentRecord foundData;                      // The extent data actually found
 

-                       key = (HFSExtentKey*) &btIterator.key;
+                       key = (HFSExtentKey*) &btIterator->key;

                        key->keyLength  = kHFSExtentKeyMaximumLength;
                        key->forkType   = extentFileKey->forkType;
                        key->fileID             = extentFileKey->fileID;
                        key->startBlock = extentFileKey->startBlock;
 
                        key->keyLength  = kHFSExtentKeyMaximumLength;
                        key->forkType   = extentFileKey->forkType;
                        key->fileID             = extentFileKey->fileID;
                        key->startBlock = extentFileKey->startBlock;
 

-                       btIterator.hint.index = 0;
-                       btIterator.hint.nodeNum = extentBTreeHint;
+                       btIterator->hint.index = 0;
+                       btIterator->hint.nodeNum = extentBTreeHint;

 
                        btRecord.bufferAddress = &foundData;
                        btRecord.itemSize = sizeof(HFSExtentRecord);
                        btRecord.itemCount = 1;
 
 
                        btRecord.bufferAddress = &foundData;
                        btRecord.itemSize = sizeof(HFSExtentRecord);
                        btRecord.itemCount = 1;
 

-                       err = BTSearchRecord(btFCB, &btIterator, kInvalidMRUCacheKey, &btRecord,
-                                                                &btRecordSize, &btIterator);
+                       err = BTSearchRecord(btFCB, btIterator, &btRecord, &btRecordSize, btIterator);

                        
                        if (err == noErr)
                                err = HFSPlusToHFSExtents(extentData, (HFSExtentDescriptor *)&foundData);
 
                        if (err == noErr)
                        
                        if (err == noErr)
                                err = HFSPlusToHFSExtents(extentData, (HFSExtentDescriptor *)&foundData);
 
                        if (err == noErr)

-                               err = BTReplaceRecord(btFCB, &btIterator, &btRecord, btRecordSize);
+                               err = BTReplaceRecord(btFCB, btIterator, &btRecord, btRecordSize);
+                       (void) BTFlushPath(btFCB);

                }
                else {          //      HFS Plus volume
                        HFSPlusExtentRecord     foundData;              // The extent data actually found
 
                }
                else {          //      HFS Plus volume
                        HFSPlusExtentRecord     foundData;              // The extent data actually found
 

-                       BlockMoveData(extentFileKey, &btIterator.key, sizeof(HFSPlusExtentKey));
+                       BlockMoveData(extentFileKey, &btIterator->key, sizeof(HFSPlusExtentKey));

 
 

-                       btIterator.hint.index = 0;
-                       btIterator.hint.nodeNum = extentBTreeHint;
+                       btIterator->hint.index = 0;
+                       btIterator->hint.nodeNum = extentBTreeHint;

 
                        btRecord.bufferAddress = &foundData;
                        btRecord.itemSize = sizeof(HFSPlusExtentRecord);
                        btRecord.itemCount = 1;
 
 
                        btRecord.bufferAddress = &foundData;
                        btRecord.itemSize = sizeof(HFSPlusExtentRecord);
                        btRecord.itemCount = 1;
 

-                       err = BTSearchRecord(btFCB, &btIterator, kInvalidMRUCacheKey, &btRecord,
-                                                                &btRecordSize, &btIterator);
+                       err = BTSearchRecord(btFCB, btIterator, &btRecord, &btRecordSize, btIterator);

        
                        if (err == noErr) {
                                BlockMoveData(extentData, &foundData, sizeof(HFSPlusExtentRecord));
        
                        if (err == noErr) {
                                BlockMoveData(extentData, &foundData, sizeof(HFSPlusExtentRecord));

-                               err = BTReplaceRecord(btFCB, &btIterator, &btRecord, btRecordSize);
+                               err = BTReplaceRecord(btFCB, btIterator, &btRecord, btRecordSize);

                        }
                        }

+                       (void) BTFlushPath(btFCB);

                }
                }

+               FREE(btIterator, M_TEMP);       

        }
        
        return err;
        }
        
        return err;


@@ -1914,7 +1948,7 @@ Boolean NodesAreContiguous(
        if ( !ExtentsAreIntegral(extents, mask, &blocksChecked, &lastExtentReached) )
                return FALSE;
 
        if ( !ExtentsAreIntegral(extents, mask, &blocksChecked, &lastExtentReached) )
                return FALSE;
 

-       if (lastExtentReached || (SInt64)((SInt64)blocksChecked * (SInt64)vcb->blockSize) >= fcb->fcbPLen)
+       if (lastExtentReached || (SInt64)((SInt64)blocksChecked * (SInt64)vcb->blockSize) >= fcb->ff_size)

                return TRUE;
 
        startBlock = blocksChecked;
                return TRUE;
 
        startBlock = blocksChecked;


@@ -1922,7 +1956,7 @@ Boolean NodesAreContiguous(
        // check the overflow extents (if any)
        while ( !lastExtentReached )
        {
        // check the overflow extents (if any)
        while ( !lastExtentReached )
        {

-               result = FindExtentRecord(vcb, kDataForkType, H_FILEID(fcb), startBlock, FALSE, &key, extents, &hint);
+               result = FindExtentRecord(vcb, kDataForkType, fcb->ff_cp->c_fileid, startBlock, FALSE, &key, extents, &hint);

                if (result) break;
 
                if ( !ExtentsAreIntegral(extents, mask, &blocksChecked, &lastExtentReached) )
                if (result) break;
 
                if ( !ExtentsAreIntegral(extents, mask, &blocksChecked, &lastExtentReached) )