Changeset 1131 for Whitix

Timestamp:

10/14/08 19:36:32 (1 month ago)

Author:

mwhitworth

Message:

Misc fixes, mainly to do with references.

Files:

• Whitix/branches/keobject/fs/vfs/vnode.c (modified) (5 diffs)

Whitix/branches/keobject/fs/vfs/vnode.c

@@ -86 +86 @@
 
         if (err)
-                return err;
+                goto out;
 
         /* This is how mountpoints work. FIXME: Does every vNode need a mountNode? */
@@ -104 +104 @@
         }
 
+out:
         VNodeRelease(dir);
         return err;
@@ -168 +169 @@
                 if (!c)
                         break;
+                        
+                currNode->refs++;
 
                 if (VfsDoLookup(currName, length, &newNode, currNode) || !(newNode->mode & VFS_ATTR_DIR))
                 {
-                        VNodeRelease(currNode);
+//                      VNodeRelease(currNode); /* FIXME: Needed? currNode is released in VfsDoLookup */
                         return NULL;
                 }
@@ -217 +220 @@
         if (!dir)
                 return -ENOENT;
-
+        
         /* Now the directory vNode is known, create/open the file, according to what
         the caller wants to do. */
@@ -246 +249 @@
         }else if (flags & FILE_CREATE_OPEN)
         {
+                dir->refs++;
                 /* The file can either be created or opened */
                 if (VfsDoLookup(name,nameLen,retVal,dir))
                 {
                         /* Obviously doesn't exist, so create it */
-                        if (dir->vNodeOps->create)
+                        if (dir->vNodeOps && dir->vNodeOps->create)
                         {
                                 ret=dir->vNodeOps->create(retVal,dir,name,nameLen);