Changeset 793 for Whitix/branches

Timestamp:

07/13/08 20:49:03 (5 months ago)

Author:

mwhitworth

Message:

Handle unmounting better.

Files:

• Whitix/branches/fs/fs/vfs/super.c (modified) (4 diffs)

Whitix/branches/fs/fs/vfs/super.c

@@ -166 +166 @@
         superBlock->parent=mountNode->superBlock;
         mountNode->mountNode=superBlock->mount;
-        ++mountNode->refs;
         superBlock->mount->refs+=2;
 
@@ -240 +239 @@
         struct VNode* vNode;
 
-        ListForEachEntry(vNode,&superBlock->vNodeList,next)
+        ListForEachEntry(vNode, &superBlock->vNodeList, next)
+        {
                 /* Only the superblock's 'root' is allowed to have a reference */
                 if (vNode->refs && vNode != superBlock->mount)
                         return -EBUSY;
+        }
 
         return 0;
@@ -278 +279 @@
 
         coveredNode->mountNode=NULL;
+        
         VNodeRelease(coveredNode);
-
+        VNodeRelease(coveredNode); /* Reference from the mount node needs to be freed. */
+        
         VNodeRelease(superBlock->mount);
 
@@ -417 +420 @@
         or it may have no vNodes except the mount vNode (in it's ReadSuper) */
 
-        if (superBlock->privData)
+        if (superBlock->sbOps->freeSuper)
+        {
+                superBlock->sbOps->freeSuper(superBlock);
+        }else if (superBlock->privData)
                 free(superBlock->privData);