yaffs direct: Change handle breaking mechanism

Wehn we force an unmount we have to break the handles. This
mechanism does it better.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 02d5255f5ba3599187db4940cc055797699aeefe..a970577cb4b8b9b2b0be56c1db69e4df441094af 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -211,8 +211,10 @@ static void yaffsfs_PutInode(int inodeId)
        if(inodeId >= 0 && inodeId < YAFFSFS_N_HANDLES){
                yaffsfs_Inode *in = & yaffsfs_inode[inodeId];
                in->count--;
        if(inodeId >= 0 && inodeId < YAFFSFS_N_HANDLES){
                yaffsfs_Inode *in = & yaffsfs_inode[inodeId];
                in->count--;

-               if(in->count <= 0)
+               if(in->count <= 0){

                        yaffsfs_ReleaseInode(in);
                        yaffsfs_ReleaseInode(in);

+                       in->count = 0;
+               }

        }       
 }
 
        }       
 }
 


@@ -277,15 +279,19 @@ static int yaffsfs_PutHandle(int handle)
        return 0;
 }
 
        return 0;
 }
 

-static void yaffsfs_PutDeviceHandles(struct yaffs_dev *dev)
+static void yaffsfs_BreakDeviceHandles(struct yaffs_dev *dev)

 {
 {

-       yaffsfs_Handle *yh;
+       yaffsfs_Handle *h;
+       struct yaffs_obj *obj;

        int i;
        for(i = 0; i < YAFFSFS_N_HANDLES; i++){
        int i;
        for(i = 0; i < YAFFSFS_N_HANDLES; i++){

-               yh = & yaffsfs_handle[i];
-               if(yh->useCount>0 && 
-                       yaffsfs_inode[yh->inodeId].iObj->my_dev == dev)
-                       yaffsfs_PutHandle(i);
+               h = yaffsfs_GetHandlePointer(i);
+               obj = yaffsfs_GetHandleObject(i);
+               if(h && h->useCount>0 && obj && obj->my_dev == dev){
+                       h->useCount = 0;
+                       yaffsfs_PutInode(h->inodeId);
+                       h->inodeId = -1;
+               }

        }
 }
 
        }
 }
 


@@ -2172,7 +2178,7 @@ int yaffs_unmount2(const YCHAR *path, int force)
 
                        if(!inUse || force){
                                if(inUse)
 
                        if(!inUse || force){
                                if(inUse)

-                                       yaffsfs_PutDeviceHandles(dev);
+                                       yaffsfs_BreakDeviceHandles(dev);

                                yaffs_deinitialise(dev);
 
                                retVal = 0;
                                yaffs_deinitialise(dev);
 
                                retVal = 0;