i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bfs_walk() now prints the file name if it couldn't locate a file with debug

Browse Source 
output turned on.
bfs_open_dir() now accepts again all containers, because bfs_open_index_dir()
is using it, too (too bad when you forgot about your own code).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2122 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-11-29 20:03:49 +00:00
parent 006928f81b
commit af9ba303e4
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+10 -6
View File
@@ -479,11 +479,11 @@ bfs_suspend_vnode(void *_ns, void *_node)
*/ */
static int static int
bfs_walk(void *_ns, void *_directory, const char *file, char **_resolvedPath, vnode_id *vnid) bfs_walk(void *_ns, void *_directory, const char *file, char **_resolvedPath, vnode_id *_vnodeID)
{ {
//FUNCTION_START(("file = %s\n",file)); //FUNCTION_START(("file = %s\n",file));
if (_ns == NULL || _directory == NULL || file == NULL) if (_ns == NULL || _directory == NULL || file == NULL || _vnodeID == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
Volume *volume = (Volume *)_ns; Volume *volume = (Volume *)_ns;
@@ -498,11 +498,13 @@ bfs_walk(void *_ns, void *_directory, const char *file, char **_resolvedPath, vn
if (directory->GetTree(&tree) != B_OK) if (directory->GetTree(&tree) != B_OK)
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
if ((status = tree->Find((uint8 *)file, (uint16)strlen(file), vnid)) < B_OK) if ((status = tree->Find((uint8 *)file, (uint16)strlen(file), _vnodeID)) < B_OK) {
RETURN_ERROR(status); PRINT(("bfs_walk() could not find %Ld:\"%s\": %s\n", directory->BlockNumber(), file, strerror(status)));
return status;
}
Inode *inode; Inode *inode;
if ((status = get_vnode(volume->ID(), *vnid, (void **)&inode)) != B_OK) { if ((status = get_vnode(volume->ID(), *_vnodeID, (void **)&inode)) != B_OK) {
REPORT_ERROR(status); REPORT_ERROR(status);
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
} }
@@ -1495,7 +1497,9 @@ bfs_open_dir(void *_ns, void *_node, void **_cookie)
Inode *inode = (Inode *)_node; Inode *inode = (Inode *)_node;
if (!inode->IsDirectory()) // we don't ask here for directories only, because the bfs_open_index_dir()
// function utilizes us (so we must be able to open indices as well)
if (!inode->IsContainer())
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
BPlusTree *tree; BPlusTree *tree;