X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..6d2010ae8f7a6078e10b361c6962983bab233e0f:/bsd/hfs/hfscommon/BTree/BTreeNodeOps.c?ds=sidebyside

diff --git a/bsd/hfs/hfscommon/BTree/BTreeNodeOps.c b/bsd/hfs/hfscommon/BTree/BTreeNodeOps.c
index ab2962683..89f4eaf13 100644
--- a/bsd/hfs/hfscommon/BTree/BTreeNodeOps.c
+++ b/bsd/hfs/hfscommon/BTree/BTreeNodeOps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2002, 2005-2008 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -191,32 +191,39 @@ Result:
 
 OSStatus	GetNode		(BTreeControlBlockPtr	 btreePtr,
 						 u_int32_t				 nodeNum,
+			   			 u_int32_t				 flags, 
 						 NodeRec				*nodePtr )
 {
 	OSStatus			err;
 	GetBlockProcPtr		getNodeProc;
+	u_int32_t			options;
 	
 
-	//€€ is nodeNum within proper range?
+	// is nodeNum within proper range?
 	if( nodeNum >= btreePtr->totalNodes )
 	{
-		Panic("\pGetNode:nodeNum >= totalNodes");
+		Panic("GetNode:nodeNum >= totalNodes");
 		err = fsBTInvalidNodeErr;
 		goto ErrorExit;
 	}
 	
 	nodePtr->blockSize = btreePtr->nodeSize;	// indicate the size of a node
+
+	options = kGetBlock;
+	if ( flags & kGetNodeHint ) 
+	{
+		options |= kGetBlockHint;
+	}
 	
 	getNodeProc = btreePtr->getBlockProc;
 	err = getNodeProc (btreePtr->fileRefNum,
 					   nodeNum,
-					   kGetBlock,
+					   options,
 					   nodePtr );
 
 	if (err != noErr)
 	{
-		Panic ("\pGetNode: getNodeProc returned error.");
-	//	nodePtr->buffer = nil;
+		Panic ("GetNode: getNodeProc returned error.");
 		goto ErrorExit;
 	}
 	++btreePtr->numGetNodes;
@@ -270,7 +277,7 @@ OSStatus	GetNewNode	(BTreeControlBlockPtr	 btreePtr,
 					   
 	if (err != noErr)
 	{
-		Panic ("\pGetNewNode: getNodeProc returned error.");
+		Panic ("GetNewNode: getNodeProc returned error.");
 	//	returnNodePtr->buffer = nil;
 		return err;
 	}
@@ -320,7 +327,7 @@ OSStatus	ReleaseNode	(BTreeControlBlockPtr	 btreePtr,
 		err = releaseNodeProc (btreePtr->fileRefNum,
 							   nodePtr,
 							   kReleaseBlock );
-		PanicIf (err, "\pReleaseNode: releaseNodeProc returned error.");
+		PanicIf (err, "ReleaseNode: releaseNodeProc returned error.");
 		++btreePtr->numReleaseNodes;
 	}
 
@@ -362,7 +369,7 @@ OSStatus	TrashNode	(BTreeControlBlockPtr	 btreePtr,
 		err = releaseNodeProc (btreePtr->fileRefNum,
 							   nodePtr,
 							   kReleaseBlock | kTrashBlock );
-		PanicIf (err, "\TrashNode: releaseNodeProc returned error.");
+		PanicIf (err, "TrashNode: releaseNodeProc returned error.");
 		++btreePtr->numReleaseNodes;
 	}