yaffs direct: Break handles when unmounting, normalise handling of mount point names

[yaffs2.git] / direct / yaffsfs.c

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 41d37f46601f1939e90ea883ec2002b1e348b3d6..203a034c739dfd4287459cb8402746a8b5efb6ee 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -31,7 +31,8 @@
 #define YAFFSFS_RW_SIZE  (1<<YAFFSFS_RW_SHIFT)
 
 /* Some forward references */
-static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, const YCHAR *path, int symDepth, int getEquiv);
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory,
+                       const YCHAR *path, int symDepth, int getEquiv);
 static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
 
 unsigned int yaffs_wr_attempts;
@@ -273,6 +274,18 @@ static int yaffsfs_PutHandle(int handle)
        return 0;
 }
 
+static void yaffsfs_PutDeviceHandles(struct yaffs_dev *dev)
+{
+       yaffsfs_Handle *yh;
+       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);
+       }
+}
+
 
 
 
@@ -322,7 +335,7 @@ LIST_HEAD(yaffsfs_deviceList);
 /*
  * yaffsfs_FindDevice
  * yaffsfs_FindRoot
- * Scan the configuration list to find the root.
+ * Scan the configuration list to find the device
  * Curveballs: Should match paths that end in '/' too
  * Curveball2 Might have "/x/ and "/x/y". Need to return the longest match
  */
@@ -397,6 +410,16 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPat
        return retval;
 }
 
+/* FindMountPoint only returns a dev entry if the path is a mount point */
+static struct yaffs_dev *yaffsfs_FindMountPoint(const YCHAR *path)
+{
+       struct yaffs_dev *dev;
+       YCHAR *restOfPath=NULL;
+       dev = yaffsfs_FindDevice(path,&restOfPath);
+       if(dev && restOfPath && *restOfPath)
+               dev = NULL;
+       return dev;
+}
 
 static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 {
@@ -870,7 +893,16 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off
                        nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
                        if(nToRead > nbyte)
                                nToRead = nbyte;
-                       nRead = yaffs_file_rd(obj,buf,pos,nToRead);
+
+                       /* Tricky bit... 
+                        * Need to reverify object in case the device was
+                        * unmounted in another thread.
+                        */
+                       obj = yaffsfs_GetHandleObject(fd);
+                       if(!obj)
+                               nRead = 0;
+                       else
+                               nRead = yaffs_file_rd(obj,buf,pos,nToRead);
 
                        if(nRead > 0){
                                totalRead += nRead;
@@ -953,11 +985,21 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite,
                yaffsfs_GetHandle(fd);
                pos = startPos;
                while(nbyte > 0) {
+
                        nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
                        if(nToWrite > nbyte)
                                nToWrite = nbyte;
 
-                       nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,write_trhrough);
+                       /* Tricky bit... 
+                        * Need to reverify object in case the device was
+                        * remounted or unmounted in another thread.
+                        */
+                       obj = yaffsfs_GetHandleObject(fd);
+                       if(!obj || obj->my_dev->read_only)
+                               nWritten = 0;
+                       else
+                               nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,
+                                                       write_trhrough);
                        if(nWritten > 0){
                                totalWritten += nWritten;
                                pos += nWritten;
@@ -1821,7 +1863,6 @@ int yaffs_mount2(const YCHAR *path,int read_only)
        int retVal=-1;
        int result=YAFFS_FAIL;
        struct yaffs_dev *dev=NULL;
-       YCHAR *dummy;
 
        T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
 
@@ -1829,7 +1870,7 @@ int yaffs_mount2(const YCHAR *path,int read_only)
 
        yaffsfs_InitHandles();
 
-       dev = yaffsfs_FindDevice(path,&dummy);
+       dev = yaffsfs_FindMountPoint(path);
        if(dev){
                if(!dev->is_mounted){
                        dev->read_only = read_only ? 1 : 0;
@@ -1889,10 +1930,10 @@ int yaffs_remount(const YCHAR *path, int force, int read_only)
 {
         int retVal=-1;
        struct yaffs_dev *dev=NULL;
-       YCHAR *dummy;
+       yaffsfs_Handle *yh;
 
        yaffsfs_Lock();
-       dev = yaffsfs_FindDevice(path,&dummy);
+       dev = yaffsfs_FindMountPoint(path);
        if(dev){
                if(dev->is_mounted){
                        int i;
@@ -1901,7 +1942,9 @@ int yaffs_remount(const YCHAR *path, int force, int read_only)
                        yaffs_flush_whole_cache(dev);
 
                        for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){
-                               if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
+                               yh = & yaffsfs_handle[i];
+                               if(yh->useCount>0 && 
+                                       yaffsfs_inode[yh->inodeId].iObj->my_dev == dev)
                                        inUse = 1; /* the device is in use, can't unmount */
                        }
 
@@ -1929,10 +1972,9 @@ int yaffs_unmount2(const YCHAR *path, int force)
 {
         int retVal=-1;
        struct yaffs_dev *dev=NULL;
-       YCHAR *dummy;
 
        yaffsfs_Lock();
-       dev = yaffsfs_FindDevice(path,&dummy);
+       dev = yaffsfs_FindMountPoint(path);
        if(dev){
                if(dev->is_mounted){
                        int i;
@@ -1942,11 +1984,14 @@ int yaffs_unmount2(const YCHAR *path, int force)
                        yaffs_checkpoint_save(dev);
 
                        for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){
-                               if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
+                               if(yaffsfs_handle[i].useCount > 0 && 
+                               yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
                                        inUse = 1; /* the device is in use, can't unmount */
                        }
 
                        if(!inUse || force){
+                               if(inUse)
+                                       yaffsfs_PutDeviceHandles(dev);
                                yaffs_deinitialise(dev);
 
                                retVal = 0;
@@ -1958,8 +2003,7 @@ int yaffs_unmount2(const YCHAR *path, int force)
                        /* todo error - not mounted. */
                        yaffsfs_SetError(-EINVAL);
 
-       }
-       else
+       } else
                /* todo error - no device */
                yaffsfs_SetError(-ENODEV);
 
@@ -2352,6 +2396,9 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
 
 int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
 {
+       pathname=pathname;
+       mode=mode;
+       dev=dev;
        return -1;
 }
 
@@ -2384,7 +2431,9 @@ int yaffs_set_error(int error)
 
 int yaffs_dump_dev(const YCHAR *path)
 {
-#if 0
+#if 1
+       path=path;
+#else
        YCHAR *rest;
 
        struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest);