Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken TRACE() arg. Add more tracing to spot a crash on unmount after deleting a folder. Return B_OK from read() when node has no data, this allows copying bookmarks which are empty files. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36080 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2010-04-08 01:35:58 +00:00
parent ce7942c6e0
commit 092cf00807
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/kernel/file_systems/googlefs/googlefs.c
View File

@ -222,7 +222,7 @@ static int compare_fs_node_by_vnid(fs_node *node, ino_t *id)
static int googlefs_free_vnode(fs_volume *_volume, fs_node *node)
{
fs_nspace *ns = (fs_nspace *)_volume->private_volume;
TRACE((PFS "%s(%ld, %Ld, %s)\n", __FUNCTION__, ns->nsid, node->vnid));
TRACE((PFS "%s(%ld, %Ld)\n", __FUNCTION__, ns->nsid, node->vnid));
free_lock(&node->l);
atomic_add(&ns->nodecount, -1);
vnidpool_put(ns->vnids, node->vnid);
@ -246,12 +246,15 @@ int googlefs_remove_vnode(fs_volume *_volume, fs_vnode *_node, bool reenter)
if (node->vnid == ns->rootid) {
TRACE((PFS "asked to remove the root node!!\n"));
}
TRACE((PFS "SLL_REMOVE(ns->nodes %p, nlnext, %p)\n", ns->nodes, node));
//LOCK(&node->l);
err = SLL_REMOVE(ns->nodes, nlnext, node);
/* query dirs must be removed from the query list too */
TRACE((PFS "SLL_REMOVE(ns->queries %p, qnext, %p)\n", ns->nodes, node));
err = SLL_REMOVE(ns->queries, qnext, node);
if (node->parent) {
LOCK(&node->parent->l);
TRACE((PFS "SLL_REMOVE(node->parent->children %p, next, %p)\n", node->parent->children, node));
SLL_REMOVE(node->parent->children, next, node);
UNLOCK(&node->parent->l);
}
@ -617,11 +620,9 @@ int googlefs_read(fs_volume *_volume, fs_vnode *_node, fs_file_cookie *cookie, o
fs_node *node = (fs_node *)_node->private_node;
status_t err = B_OK;
TRACE((PFS"read(%ld, %Ld, %Ld, %ld)\n", ns->nsid, node->vnid, pos, *len));
if (node->data_size == 0 || !node->data)
err = ENOSYS;
if (pos < 0 || pos > node->data_size)
err = EFPOS;
if (err) {
if (err || node->data_size == 0 || !node->data) {
*len = 0;
return err;
}