/*
- * Copyright (c) 1996-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1996-2005 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
- *
- * 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
+ * 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. The rights granted to you under the
+ * License may not be used to create, or enable the creation or
+ * redistribution of, unlawful or unlicensed copies of an Apple operating
+ * system, or to circumvent, violate, or enable the circumvention or
+ * violation of, any terms of an Apple operating system software license
+ * agreement.
+ *
+ * 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,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ *
+ * 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,
+ * 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_OSREFERENCE_HEADER_END@
*
* @(#)BTreeScanner.c
*/
#include <sys/kernel.h>
+#include "../../hfs_endian.h"
#include "../headers/BTreeScanner.h"
static int FindNextLeafNode( BTScanState *scanState, Boolean avoidIO )
{
- int err;
+ int err;
+ BlockDescriptor block;
+ FileReference fref;
err = noErr; // Assume everything will be OK
(u_int8_t *) scanState->currentNodePtr += scanState->btcb->nodeSize;
}
- // Make sure this is a valid node
- if ( CheckNode( scanState->btcb, scanState->currentNodePtr ) != noErr )
- {
+ /* Fake a BlockDescriptor */
+ block.blockHeader = NULL; /* No buffer cache buffer */
+ block.buffer = scanState->currentNodePtr;
+ block.blockNum = scanState->nodeNum;
+ block.blockSize = scanState->btcb->nodeSize;
+ block.blockReadFromDisk = 1;
+ block.isModified = 0;
+
+ fref = scanState->btcb->fileRefNum;
+
+ /* This node was read from disk, so it must be swapped/checked. */
+ err = hfs_swap_BTNode(&block, fref, kSwapBTNodeBigToHost);
+ if ( err != noErr ) {
+ printf("FindNextLeafNode: Error from hfs_swap_BTNode (node %u)\n", scanState->nodeNum);
continue;
}
-
+
if ( scanState->currentNodePtr->kind == kBTLeafNode )
break;
}
{
int myErr = E_NONE;
BTreeControlBlockPtr myBTreeCBPtr;
- daddr_t myPhyBlockNum;
+ daddr64_t myPhyBlockNum;
u_int32_t myBufferSize;
struct vnode * myDevPtr;
int myBlockRun;
// release old buffer if we have one
if ( theScanStatePtr->bufferPtr != NULL )
{
- theScanStatePtr->bufferPtr->b_flags |= (B_INVAL | B_AGE);
- brelse( theScanStatePtr->bufferPtr );
+ buf_markinvalid(theScanStatePtr->bufferPtr);
+ buf_brelse( theScanStatePtr->bufferPtr );
theScanStatePtr->bufferPtr = NULL;
theScanStatePtr->currentNodePtr = NULL;
}
myBTreeCBPtr = theScanStatePtr->btcb;
// map logical block in catalog btree file to physical block on volume
- myErr = VOP_BMAP( myBTreeCBPtr->fileRefNum, theScanStatePtr->nodeNum,
- &myDevPtr, &myPhyBlockNum, &myBlockRun );
+ myErr = hfs_bmap(myBTreeCBPtr->fileRefNum, theScanStatePtr->nodeNum,
+ &myDevPtr, &myPhyBlockNum, &myBlockRun);
if ( myErr != E_NONE )
{
goto ExitThisRoutine;
}
// now read blocks from the device
- myErr = bread( myDevPtr,
- myPhyBlockNum,
- myBufferSize,
- NOCRED,
- &theScanStatePtr->bufferPtr );
+ myErr = (int)buf_bread(myDevPtr,
+ myPhyBlockNum,
+ myBufferSize,
+ NOCRED,
+ &theScanStatePtr->bufferPtr );
if ( myErr != E_NONE )
{
goto ExitThisRoutine;
}
- theScanStatePtr->nodesLeftInBuffer = theScanStatePtr->bufferPtr->b_bcount / theScanStatePtr->btcb->nodeSize;
- theScanStatePtr->currentNodePtr = (BTNodeDescriptor *) theScanStatePtr->bufferPtr->b_data;
+ theScanStatePtr->nodesLeftInBuffer = buf_count(theScanStatePtr->bufferPtr) / theScanStatePtr->btcb->nodeSize;
+ theScanStatePtr->currentNodePtr = (BTNodeDescriptor *) buf_dataptr(theScanStatePtr->bufferPtr);
ExitThisRoutine:
return myErr;
scanState->currentNodePtr = NULL;
scanState->nodesLeftInBuffer = 0; // no nodes currently in buffer
scanState->recordsFound = recordsFound;
- scanState->startTime = time; // initialize our throttle
+ microuptime(&scanState->startTime); // initialize our throttle
return noErr;
if ( scanState->bufferPtr != NULL )
{
- scanState->bufferPtr->b_flags |= (B_INVAL | B_AGE);
- brelse( scanState->bufferPtr );
+ buf_markinvalid(scanState->bufferPtr);
+ buf_brelse( scanState->bufferPtr );
scanState->bufferPtr = NULL;
scanState->currentNodePtr = NULL;
}
projects / apple / xnu.git / blobdiff