yaffs Add function to get number of open handles
[yaffs2.git] / direct / yaffsfs.c
index 6206ed4..b709d93 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
-#include <string.h> // for memset
 #include "yportenv.h"
+#include "yaffs_trace.h"
+
+#include <string.h> /* for memset */
 
 #define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5
 
 #endif
 
 
-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.20 2008-07-02 20:17:41 charles Exp $";
-
-// configurationList is the list of devices that are supported
-static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
-
+/* YAFFSFS_RW_SIZE must be a power of 2 */
+#define YAFFSFS_RW_SHIFT (13)
+#define YAFFSFS_RW_SIZE  (1<<YAFFSFS_RW_SHIFT)
 
 /* Some forward references */
 static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth);
 static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
 
-
-// Handle management.
-//
-
-
 unsigned int yaffs_wr_attempts;
 
-typedef struct
-{
-       __u8  inUse:1;          // this handle is in use
-       __u8  readOnly:1;       // this handle is read only
-       __u8  append:1;         // append only
-       __u8  exclusive:1;      // exclusive
-       __u32 position;         // current position in file
-       yaffs_Object *obj;      // the object
-}yaffsfs_Handle;
+/*
+ * Handle management.
+ * There are open inodes in yaffsfs_Inode.
+ * There are open handles in yaffsfs_Handle.
+ *
+ * Things are structured this way to be like the Linux VFS model
+ * so that interactions with the yaffs guts calls are similar.
+ * That means more common code paths and less special code.
+ * That means better testing etc.
+ */
 
+typedef struct {
+       int count;      /* Number of handles accessing this inode */
+       yaffs_Object *iObj;
+} yaffsfs_Inode;
+
+typedef struct{
+       __u8    readOnly:1;
+       __u8    append:1;
+       int     inodeId:13;     /* Index to corresponding yaffsfs_Inode */
+       int     useCount:16;    /* Use count for this handle */
+       __u32 position;         /* current position in file */
+}yaffsfs_Handle;
 
+static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
 static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
+static int yaffsfs_handlesInitialised;
+
+/*
+ * yaffsfs_InitHandle
+ * Inilitalise handle management on start-up.
+ */
 
-// yaffsfs_InitHandle
-/// Inilitalise handles on start-up.
-//
-static int yaffsfs_InitHandles(void)
+static void yaffsfs_InitHandles(void)
 {
        int i;
+       if(yaffsfs_handlesInitialised)
+                return;
+
+       memset(yaffsfs_inode,0,sizeof(yaffsfs_inode));
+       memset(yaffsfs_handle,0,sizeof(yaffsfs_handle));
        for(i = 0; i < YAFFSFS_N_HANDLES; i++)
-       {
-               yaffsfs_handle[i].inUse = 0;
-               yaffsfs_handle[i].obj = NULL;
-       }
-       return 0;
+               yaffsfs_handle[i].inodeId = -1;
 }
 
 yaffsfs_Handle *yaffsfs_GetHandlePointer(int h)
 {
        if(h < 0 || h >= YAFFSFS_N_HANDLES)
-       {
                return NULL;
-       }
 
        return &yaffsfs_handle[h];
 }
 
-yaffs_Object *yaffsfs_GetHandleObject(int handle)
+yaffsfs_Inode *yaffsfs_GetInodePointer(int handle)
 {
        yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
 
-       if(h && h->inUse)
-       {
-               return h->obj;
-       }
+       if(h && h->useCount > 0 && h->inodeId >= 0 && h->inodeId < YAFFSFS_N_HANDLES)
+               return  &yaffsfs_inode[h->inodeId];
+
+       return NULL;
+}
+
+yaffs_Object *yaffsfs_GetHandleObject(int handle)
+{
+       yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle);
+
+       if(in)
+               return in->iObj;
 
        return NULL;
 }
 
+/*
+ * yaffsfs_FindInodeIdForObject
+ * Find the inode entry for an object, if it exists.
+ */
+
+static int yaffsfs_FindInodeIdForObject(yaffs_Object *obj)
+{
+       int i;
+       int ret = -1;
+       
+       if(obj)
+               obj = yaffs_GetEquivalentObject(obj);
+
+       /* Look for it in open inode table*/
+       for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){
+               if(yaffsfs_inode[i].iObj == obj)
+                       ret = i;
+       }
+       return ret;
+}
+
+/*
+ * yaffsfs_GetInodeIdForObject
+ * Grab an inode entry when opening a new inode.
+ */
+static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
+{
+       int i;
+       int ret;
+       yaffsfs_Inode *in = NULL;
+       
+       if(obj)
+               obj = yaffs_GetEquivalentObject(obj);
+
+        ret = yaffsfs_FindInodeIdForObject(obj);
+
+       for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){
+               if(!yaffsfs_inode[i].iObj)
+                       ret = i;
+       }
+
+       if(ret>=0){
+               in = &yaffsfs_inode[ret];
+               if(!in->iObj)
+                       in->count = 0;
+               in->iObj = obj;
+               in->count++;
+       }
+       
+       
+       return ret;
+}
+
+
+static int yaffsfs_CountHandles(yaffs_Object *obj)
+{
+       int i = yaffsfs_FindInodeIdForObject(obj);
+
+       if(i >= 0)
+               return yaffsfs_inode[i].count;
+       else
+               return 0;
+}
+
+static void yaffsfs_ReleaseInode(yaffsfs_Inode *in)
+{
+       yaffs_Object *obj;
+       
+       obj = in->iObj;
+
+       if(obj->unlinked)
+               yaffs_DeleteObject(obj);
+       
+       obj->myInode = NULL;
+       in->iObj = NULL;
+
+}
+
+static void yaffsfs_PutInode(int inodeId)
+{
+       if(inodeId >= 0 && inodeId < YAFFSFS_N_HANDLES){
+               yaffsfs_Inode *in = & yaffsfs_inode[inodeId];
+               in->count--;
+               if(in->count <= 0)
+                       yaffsfs_ReleaseInode(in);
+       }       
+}
 
-//yaffsfs_GetHandle
-// Grab a handle (when opening a file)
-//
 
-static int yaffsfs_GetHandle(void)
+/*
+ * yaffsfs_GetHandle
+ * Grab a handle (when opening a file)
+ */
+
+static int yaffsfs_GetNewHandle(void)
 {
        int i;
        yaffsfs_Handle *h;
 
-       for(i = 0; i < YAFFSFS_N_HANDLES; i++)
-       {
+       for(i = 0; i < YAFFSFS_N_HANDLES; i++){
                h = yaffsfs_GetHandlePointer(i);
-               if(!h)
-               {
-                       // todo bug: should never happen
+               if(!h){
+                       /* todo bug: should never happen */
                }
-               if(!h->inUse)
-               {
+               if(h->useCount < 1){
                        memset(h,0,sizeof(yaffsfs_Handle));
-                       h->inUse=1;
+                       h->inodeId=-1;
+                       h->useCount=1;
                        return i;
                }
        }
        return -1;
 }
 
-// yaffs_PutHandle
-// Let go of a handle (when closing a file)
-//
+/*
+ * yaffs_GetHandle
+ * Increase use of handle when reading/writing a file
+ */
+static int yaffsfs_GetHandle(int handle)
+{
+       yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
+
+       if(h && h->useCount > 0){       
+               h->useCount++;
+       }
+       return 0;
+}
+
+/*
+ * yaffs_PutHandle
+ * Let go of a handle when closing a file or aborting an open or
+ * ending a read or write.
+ */
 static int yaffsfs_PutHandle(int handle)
 {
        yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
 
-       if(h)
-       {
-               h->inUse = 0;
-               h->obj = NULL;
+       if(h && h->useCount > 0){       
+               h->useCount--;
+               if(h->useCount < 1){
+                       if(h->inodeId >= 0){
+                               yaffsfs_PutInode(h->inodeId);
+                               h->inodeId = -1;
+                       }
+               }
        }
        return 0;
 }
 
 
 
-// Stuff to search for a directory from a path
+
+/*
+ *  Stuff to search for a directory from a path
+ */
 
 
 int yaffsfs_Match(YCHAR a, YCHAR b)
 {
-       // case sensitive
+       /* case sensitive */
        return (a == b);
 }
 
 int yaffsfs_IsPathDivider(YCHAR ch)
 {
-       YCHAR *str = YAFFS_PATH_DIVIDERS;
+       const YCHAR *str = YAFFS_PATH_DIVIDERS;
 
        while(*str){
                if(*str == ch)
@@ -156,68 +285,84 @@ int yaffsfs_IsPathDivider(YCHAR ch)
        return 0;
 }
 
-// yaffsfs_FindDevice
-// yaffsfs_FindRoot
-// Scan the configuration list to find the root.
-// Curveballs: Should match paths that end in '/' too
-// Curveball2 Might have "/x/ and "/x/y". Need to return the longest match
+
+
+YLIST_HEAD(yaffsfs_deviceList);
+
+/*
+ * yaffsfs_FindDevice
+ * yaffsfs_FindRoot
+ * Scan the configuration list to find the root.
+ * Curveballs: Should match paths that end in '/' too
+ * Curveball2 Might have "/x/ and "/x/y". Need to return the longest match
+ */
 static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
 {
-       yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
+       struct ylist_head *cfg;
        const YCHAR *leftOver;
        const YCHAR *p;
        yaffs_Device *retval = NULL;
+       yaffs_Device *dev = NULL;
        int thisMatchLength;
        int longestMatch = -1;
-
-       // Check all configs, choose the one that:
-       // 1) Actually matches a prefix (ie /a amd /abc will not match
-       // 2) Matches the longest.
-       while(cfg && cfg->prefix && cfg->dev)
-       {
+       int matching;
+
+       /*
+        * Check all configs, choose the one that:
+        * 1) Actually matches a prefix (ie /a amd /abc will not match
+        * 2) Matches the longest.
+        */
+       ylist_for_each(cfg, &yaffsfs_deviceList){
+               dev = ylist_entry(cfg, yaffs_Device, devList);
                leftOver = path;
-               p = cfg->prefix;
+               p = dev->param.name;
                thisMatchLength = 0;
+               matching = 1;
 
 
-               // Strip off any leading /'s
+               while(matching && *p && *leftOver){
+                       /* Skip over any /s */
+                       while(yaffsfs_IsPathDivider(*p))
+                             p++;
 
-               while(yaffsfs_IsPathDivider(*p))
-                       p++;
+                       /* Skip over any /s */
+                       while(yaffsfs_IsPathDivider(*leftOver))
+                             leftOver++;
+
+                       /* Now match the text part */
+                       while(matching &&
+                             *p && !yaffsfs_IsPathDivider(*p) &&
+                             *leftOver && !yaffsfs_IsPathDivider(*leftOver)){
+                               if(yaffsfs_Match(*p,*leftOver)){
+                                       p++;
+                                       leftOver++;
+                                       thisMatchLength++;
+                               } else {
+                                       matching = 0;
+                               }
+                       }
+               }
 
+               /* Skip over any /s in leftOver */
                while(yaffsfs_IsPathDivider(*leftOver))
-                       leftOver++;
-
-               while(*p && *leftOver &&
-                     yaffsfs_Match(*p,*leftOver))
-               {
-                       p++;
-                       leftOver++;
-                       thisMatchLength++;
+                     leftOver++;
 
-                       // Skip over any multiple /'s to treat them as one or
-                       // skip over a trailling / in the prefix, but not the matching string
-                       while(yaffsfs_IsPathDivider(*p) &&
-                             (yaffsfs_IsPathDivider(*(p+1)) || !(*(p+1))))
-                             p++;
-
-                       // Only skip over multiple /'s
-                       while(yaffsfs_IsPathDivider(*leftOver) &&
-                             yaffsfs_IsPathDivider(*(leftOver+1)))
-                             leftOver++;
-               }
+               // Skip over any /s in p
+               while(yaffsfs_IsPathDivider(*p))
+                     p++;
 
+               // p should now be at the end of the string (ie. fully matched)
+               if(*p)
+                       matching = 0;
 
-               if((!*p ) &&
-                  (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && // no more in this path name part
-                  (thisMatchLength > longestMatch))
+               if( matching && (thisMatchLength > longestMatch))
                {
                        // Matched prefix
                        *restOfPath = (YCHAR *)leftOver;
-                       retval = cfg->dev;
+                       retval = dev;
                        longestMatch = thisMatchLength;
                }
-               cfg++;
+
        }
        return retval;
 }
@@ -232,31 +377,29 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
        int thisMatchLength;
        int longestMatch = -1;
 
-       // Check all configs, choose the one that:
-       // 1) Actually matches a prefix (ie /a amd /abc will not match
-       // 2) Matches the longest.
-       while(cfg && cfg->prefix && cfg->dev)
-       {
+       /*
+        * Check all configs, choose the one that:
+        * 1) Actually matches a prefix (ie /a amd /abc will not match
+        * 2) Matches the longest.
+        */
+       while(cfg && cfg->prefix && cfg->dev){
                leftOver = path;
                p = cfg->prefix;
                thisMatchLength = 0;
 
-               while(*p &&  //unmatched part of prefix
-                     !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) && // the rest of the prefix is not / (to catch / at end)
-                     *leftOver &&
-                     yaffsfs_Match(*p,*leftOver))
-               {
+               while(*p &&  /* unmatched part of prefix */
+                     !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) &&
+                     *leftOver && yaffsfs_Match(*p,*leftOver)){
                        p++;
                        leftOver++;
                        thisMatchLength++;
                }
 
 
-               if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) &&      // end of prefix
-                  (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && // no more in this path name part
-                  (thisMatchLength > longestMatch))
-               {
-                       // Matched prefix
+               if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) &&  /* end of prefix */
+                  (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && /* no more in this path name part */
+                  (thisMatchLength > longestMatch)){
+                       /* Matched prefix */
                        *restOfPath = (YCHAR *)leftOver;
                        retval = cfg->dev;
                        longestMatch = thisMatchLength;
@@ -273,8 +416,7 @@ static yaffs_Object *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
        yaffs_Device *dev;
 
        dev= yaffsfs_FindDevice(path,restOfPath);
-       if(dev && dev->isMounted)
-       {
+       if(dev && dev->isMounted){
                return dev->rootDir;
        }
        return NULL;
@@ -283,30 +425,28 @@ static yaffs_Object *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
 {
 
-       while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-       {
+       while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
                YCHAR *alias = obj->variant.symLinkVariant.alias;
 
                if(yaffsfs_IsPathDivider(*alias))
-               {
-                       // Starts with a /, need to scan from root up
+                       /* Starts with a /, need to scan from root up */
                        obj = yaffsfs_FindObject(NULL,alias,symDepth++);
-               }
                else
-               {
-                       // Relative to here, so use the parent of the symlink as a start
+                       /* Relative to here, so use the parent of the symlink as a start */
                        obj = yaffsfs_FindObject(obj->parent,alias,symDepth++);
-               }
        }
        return obj;
 }
 
 
-// yaffsfs_FindDirectory
-// Parse a path to determine the directory and the name within the directory.
-//
-// eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx"
-static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR *path,YCHAR **name,int symDepth)
+/*
+ * yaffsfs_FindDirectory
+ * Parse a path to determine the directory and the name within the directory.
+ *
+ * eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx"
+ */
+static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,
+                               const YCHAR *path, YCHAR **name, int symDepth)
 {
        yaffs_Object *dir;
        YCHAR *restOfPath;
@@ -314,37 +454,29 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR
        int i;
 
        if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES)
-       {
                return NULL;
-       }
 
-       if(startDir)
-       {
+       if(startDir){
                dir = startDir;
                restOfPath = (YCHAR *)path;
        }
        else
-       {
                dir = yaffsfs_FindRoot(path,&restOfPath);
-       }
 
-       while(dir)
-       {
-               // parse off /.
-               // curve ball: also throw away surplus '/'
-               // eg. "/ram/x////ff" gets treated the same as "/ram/x/ff"
+       while(dir){
+               /*
+                * parse off /.
+                * curve ball: also throw away surplus '/'
+                * eg. "/ram/x////ff" gets treated the same as "/ram/x/ff"
+                */
                while(yaffsfs_IsPathDivider(*restOfPath))
-               {
-                       restOfPath++; // get rid of '/'
-               }
+                       restOfPath++; /* get rid of '/' */
 
                *name = restOfPath;
                i = 0;
 
-               while(*restOfPath && !yaffsfs_IsPathDivider(*restOfPath))
-               {
-                       if (i < YAFFS_MAX_NAME_LENGTH)
-                       {
+               while(*restOfPath && !yaffsfs_IsPathDivider(*restOfPath)){
+                       if (i < YAFFS_MAX_NAME_LENGTH){
                                str[i] = *restOfPath;
                                str[i+1] = '\0';
                                i++;
@@ -353,49 +485,40 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR
                }
 
                if(!*restOfPath)
-               {
-                       // got to the end of the string
+                       /* got to the end of the string */
                        return dir;
-               }
-               else
-               {
+               else{
                        if(yaffs_strcmp(str,_Y(".")) == 0)
                        {
-                               // Do nothing
+                               /* Do nothing */
                        }
                        else if(yaffs_strcmp(str,_Y("..")) == 0)
-                       {
                                dir = dir->parent;
-                       }
-                       else
-                       {
+                       else{
                                dir = yaffs_FindObjectByName(dir,str);
 
                                while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-                               {
-
                                        dir = yaffsfs_FollowLink(dir,symDepth);
 
-                               }
 
                                if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-                               {
                                        dir = NULL;
-                               }
                        }
                }
        }
-       // directory did not exist.
+       /* directory did not exist. */
        return NULL;
 }
 
-static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,const YCHAR *path,YCHAR **name,int symDepth)
+static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,
+                                       const YCHAR *path,YCHAR **name,int symDepth)
 {
        return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth);
 }
 
-// yaffsfs_FindObject turns a path for an existing object into the object
-//
+/*
+ * yaffsfs_FindObject turns a path for an existing object into the object
+ */
 static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path,int symDepth)
 {
        yaffs_Object *dir;
@@ -404,9 +527,7 @@ static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const Y
        dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
 
        if(dir && *name)
-       {
                return yaffs_FindObjectByName(dir,name);
-       }
 
        return dir;
 }
@@ -421,8 +542,8 @@ int yaffs_dup(int fd)
        yaffsfs_Lock();
 
        oldPtr = yaffsfs_GetHandlePointer(fd);
-       if(oldPtr && oldPtr->inUse)
-               newHandle = yaffsfs_GetHandle();
+       if(oldPtr && oldPtr->useCount > 0)
+               newHandle = yaffsfs_GetNewHandle();
        if(newHandle >= 0)
                newPtr = yaffsfs_GetHandlePointer(newHandle);
 
@@ -447,138 +568,119 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
        YCHAR *name;
        int handle = -1;
        yaffsfs_Handle *h = NULL;
-       int alreadyOpen = 0;
-       int alreadyExclusive = 0;
        int openDenied = 0;
        int symDepth = 0;
        int errorReported = 0;
 
-       int i;
+       /* O_EXCL only has meaning if O_CREAT is specified */
+       if(!(oflag & O_CREAT))
+               oflag &= ~(O_EXCL);
 
+       /* O_TRUNC has no meaning if (O_CREAT | O_EXCL) is specified */
+       if( (oflag & O_CREAT) & (oflag & O_EXCL))
+               oflag &= ~(O_TRUNC);
 
-       // todo sanity check oflag (eg. can't have O_TRUNC without WRONLY or RDWR
+       /* Todo: Are there any more flag combos to sanitise ? */
 
 
        yaffsfs_Lock();
 
-       handle = yaffsfs_GetHandle();
+       handle = yaffsfs_GetNewHandle();
 
-       if(handle >= 0)
-       {
+       if(handle >= 0){
 
                h = yaffsfs_GetHandlePointer(handle);
 
 
-               // try to find the exisiting object
+               /* try to find the exisiting object */
                obj = yaffsfs_FindObject(NULL,path,0);
 
                if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-               {
-
                        obj = yaffsfs_FollowLink(obj,symDepth++);
-               }
-
-               if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE)
-               {
-                       obj = NULL;
-               }
 
                if(obj)
-               {
-                       // Check if the object is already in use
-                       alreadyOpen = alreadyExclusive = 0;
+                       obj = yaffs_GetEquivalentObject(obj);
 
-                       for(i = 0; i <= YAFFSFS_N_HANDLES; i++)
-                       {
+               if(obj &&
+                       obj->variantType != YAFFS_OBJECT_TYPE_FILE &&
+                       obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+                       obj = NULL;
 
-                               if(i != handle &&
-                                  yaffsfs_handle[i].inUse &&
-                                   obj == yaffsfs_handle[i].obj)
-                                {
-                                       alreadyOpen = 1;
-                                       if(yaffsfs_handle[i].exclusive)
-                                       {
-                                               alreadyExclusive = 1;
-                                       }
-                                }
-                       }
+               if(obj){
 
-                       if(((oflag & O_EXCL) && alreadyOpen) || alreadyExclusive)
-                       {
+                       /* The file already exists or it might be a directory */
+
+                       /* If it is a directory then we can't open it as a file */
+                       if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
                                openDenied = 1;
+                               yaffsfs_SetError(-EISDIR);
+                               errorReported = 1;
                        }
 
-                       // Open should fail if O_CREAT and O_EXCL are specified
-                       if((oflag & O_EXCL) && (oflag & O_CREAT))
-                       {
+                       /* Open should fail if O_CREAT and O_EXCL are specified since
+                        * the file exists
+                        */
+                       if((oflag & O_EXCL) && (oflag & O_CREAT)){
                                openDenied = 1;
                                yaffsfs_SetError(-EEXIST);
                                errorReported = 1;
                        }
 
-                       // Check file permissions
-                       if( (oflag & (O_RDWR | O_WRONLY)) == 0 &&     // ie O_RDONLY
+                       /* Check file permissions */
+                       if( (oflag & (O_RDWR | O_WRONLY)) == 0 &&     /* ie O_RDONLY */
                           !(obj->yst_mode & S_IREAD))
-                       {
                                openDenied = 1;
-                       }
 
                        if( (oflag & O_RDWR) &&
                           !(obj->yst_mode & S_IREAD))
-                       {
                                openDenied = 1;
-                       }
 
                        if( (oflag & (O_RDWR | O_WRONLY)) &&
                           !(obj->yst_mode & S_IWRITE))
-                       {
                                openDenied = 1;
-                       }
-
-               }
 
-               else if((oflag & O_CREAT))
-               {
-                       // Let's see if we can create this file
+               } else if((oflag & O_CREAT)) {
+                       /* Let's see if we can create this file */
                        dir = yaffsfs_FindDirectory(NULL,path,&name,0);
-                       if(dir)
-                       {
+                       if(dir  && dir->myDev->readOnly){
+                               yaffsfs_SetError(-EINVAL);
+                               errorReported = 1;
+                       } else if(dir)
                                obj = yaffs_MknodFile(dir,name,mode,0,0);
-                       }
-                       else
-                       {
+                       else {
                                yaffsfs_SetError(-ENOTDIR);
                                errorReported = 1;
                        }
                }
 
-               if(obj && !openDenied)
-               {
-                       h->obj = obj;
-                       h->inUse = 1;
-               h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1;
+               if(obj && !openDenied) {
+                       int inodeId = yaffsfs_GetInodeIdForObject(obj);
+
+                       if(inodeId<0) {
+                               /*
+                                * Todo: Fix any problem if inodes run out, though that
+                                * can't happen if the number of inode items >= number of handles. 
+                                */
+                       }
+                       
+                       h->inodeId = inodeId;
+                       h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1;
                        h->append =  (oflag & O_APPEND) ? 1 : 0;
-                       h->exclusive = (oflag & O_EXCL) ? 1 : 0;
                        h->position = 0;
 
-                        obj->inUse++;
+                       /* Hook inode to object */
+                        obj->myInode = (void*) &yaffsfs_inode[inodeId];
+
                         if((oflag & O_TRUNC) && !h->readOnly)
-                        {
                                 yaffs_ResizeFile(obj,0);
-                        }
-
-               }
-               else
-               {
+               } else {
                        yaffsfs_PutHandle(handle);
-                       if(!errorReported)
-                       {
+                       if(!errorReported) {
                                yaffsfs_SetError(-EACCES);
                                errorReported = 1;
                        }
                        handle = -1;
                }
-
        }
 
        yaffsfs_Unlock();
@@ -586,7 +688,7 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
        return handle;
 }
 
-int yaffs_flush(int fd)
+int yaffs_Dofsync(int fd,int datasync)
 {
        yaffsfs_Handle *h = NULL;
        int retVal = 0;
@@ -595,14 +697,11 @@ int yaffs_flush(int fd)
 
        h = yaffsfs_GetHandlePointer(fd);
 
-       if(h && h->inUse)
-       {
-               // flush the file
-               yaffs_FlushFile(h->obj,1);
-       }
-       else
-       {
-               // bad handle
+       if(h && h->useCount > 0)
+               /* flush the file */
+               yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,datasync);
+       else {
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
                retVal = -1;
        }
@@ -612,6 +711,20 @@ int yaffs_flush(int fd)
        return retVal;
 }
 
+int yaffs_fsync(int fd)
+{
+       return yaffs_Dofsync(fd,0);
+}
+
+int yaffs_flush(int fd)
+{
+       return yaffs_fsync(fd);
+}
+
+int yaffs_fdatasync(int fd)
+{
+       return yaffs_Dofsync(fd,1);
+}
 
 int yaffs_close(int fd)
 {
@@ -622,21 +735,13 @@ int yaffs_close(int fd)
 
        h = yaffsfs_GetHandlePointer(fd);
 
-       if(h && h->inUse)
-       {
-               // clean up
-               yaffs_FlushFile(h->obj,1);
-               h->obj->inUse--;
-               if(h->obj->inUse <= 0 && h->obj->unlinked)
-               {
-                       yaffs_DeleteFile(h->obj);
-               }
+       if(h && h->useCount > 0) {
+               /* clean up */
+               yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,0);
                yaffsfs_PutHandle(fd);
                retVal = 0;
-       }
-       else
-       {
-               // bad handle
+       } else {
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
                retVal = -1;
        }
@@ -646,209 +751,185 @@ int yaffs_close(int fd)
        return retVal;
 }
 
-int yaffs_read(int fd, void *buf, unsigned int nbyte)
+
+
+int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset)
 {
        yaffsfs_Handle *h = NULL;
        yaffs_Object *obj = NULL;
        int pos = 0;
-       int nRead = -1;
+       int startPos = 0;
+       int nRead = 0;
+       int nToRead = 0;
+       int totalRead = 0;
        unsigned int maxRead;
+       __u8 *buf = (__u8 *)vbuf;
 
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
 
-       if(!h || !obj)
-       {
-               // bad handle
+       if(!h || !obj){
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
-       }
-       else if( h && obj)
-       {
-               pos=  h->position;
+               totalRead = -1;
+       } else if( h && obj){
+               if(isPread)
+                       startPos = offset;
+               else
+                       startPos = h->position;
+
+               pos = startPos;
+                                       
                if(yaffs_GetObjectFileLength(obj) > pos)
-               {
                        maxRead = yaffs_GetObjectFileLength(obj) - pos;
-               }
                else
-               {
                        maxRead = 0;
-               }
 
                if(nbyte > maxRead)
-               {
                        nbyte = maxRead;
-               }
 
 
-               if(nbyte > 0)
-               {
-                       nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
-                       if(nRead >= 0)
-                       {
-                               h->position = pos + nRead;
+               yaffsfs_GetHandle(fd);
+
+               while(nbyte > 0) {
+                       nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
+                       if(nToRead > nbyte)
+                               nToRead = nbyte;
+                       nRead = yaffs_ReadDataFromFile(obj,buf,pos,nToRead);
+
+                       if(nRead > 0){
+                               totalRead += nRead;
+                               pos += nRead;
+                               buf += nRead;
                        }
+
+                       if(nRead == nToRead)
+                               nbyte-=nRead;
                        else
-                       {
-                               //todo error
+                               nbyte = 0; /* no more to read */
+                                       
+                                       
+                       if(nbyte > 0){
+                               yaffsfs_Unlock();
+                               yaffsfs_Lock();
                        }
+
                }
-               else
-               {
-                       nRead = 0;
+
+               yaffsfs_PutHandle(fd);
+
+               if(!isPread) {
+                       if(totalRead >= 0)
+                               h->position = startPos + totalRead;
+                       else {
+                                       /* todo error */
+                       }
                }
 
        }
 
        yaffsfs_Unlock();
 
+       return (totalRead >= 0) ? totalRead : -1;
 
-       return (nRead >= 0) ? nRead : -1;
+}
 
+int yaffs_read(int fd, void *buf, unsigned int nbyte)
+{
+       return yaffsfs_do_read(fd, buf, nbyte, 0, 0);
 }
 
 int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
 {
+       return yaffsfs_do_read(fd, buf, nbyte, 1, offset);
+}
+
+int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset)
+{
        yaffsfs_Handle *h = NULL;
        yaffs_Object *obj = NULL;
        int pos = 0;
-       int nRead = -1;
-       unsigned int maxRead;
+       int startPos = 0;
+       int nWritten = 0;
+       int totalWritten = 0;
+       int writeThrough = 0;
+       int nToWrite = 0;
+       const __u8 *buf = (const __u8 *)vbuf;
 
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
 
-       if(!h || !obj)
-       {
-               // bad handle
+       if(!h || !obj){
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
-       }
-       else if( h && obj)
-       {
-               pos= offset;
-               if(yaffs_GetObjectFileLength(obj) > pos)
-               {
-                       maxRead = yaffs_GetObjectFileLength(obj) - pos;
-               }
+               totalWritten = -1;
+       } else if( h && obj && (h->readOnly || obj->myDev->readOnly)){
+               yaffsfs_SetError(-EINVAL);
+               totalWritten=-1;
+       } else if( h && obj){
+               if(h->append)
+                       startPos = yaffs_GetObjectFileLength(obj);
+               else if(isPwrite)
+                       startPos = offset;
                else
-               {
-                       maxRead = 0;
-               }
+                       startPos = h->position;
+
+               yaffsfs_GetHandle(fd);
+               pos = startPos;
+               while(nbyte > 0) {
+                       nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
+                       if(nToWrite > nbyte)
+                               nToWrite = nbyte;
+
+                       nWritten = yaffs_WriteDataToFile(obj,buf,pos,nToWrite,writeThrough);
+                       if(nWritten > 0){
+                               totalWritten += nWritten;
+                               pos += nWritten;
+                               buf += nWritten;
+                       }
 
-               if(nbyte > maxRead)
-               {
-                       nbyte = maxRead;
-               }
+                       if(nWritten == nToWrite)
+                               nbyte -= nToWrite;
+                       else
+                               nbyte = 0;
 
+                       if(nWritten < 1 && totalWritten < 1){
+                               yaffsfs_SetError(-ENOSPC);
+                               totalWritten = -1;
+                       }
 
-               if(nbyte > 0)
-               {
-                       nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
-               }
-               else
-               {
-                       nRead = 0;
+                       if(nbyte > 0){
+                               yaffsfs_Unlock();
+                               yaffsfs_Lock();
+                       }
                }
 
+               yaffsfs_PutHandle(fd);
+
+               if(!isPwrite){
+                       if(totalWritten > 0)
+                               h->position = startPos + totalWritten;
+                       else {
+                               /* todo error */
+                       }
+               }
        }
 
        yaffsfs_Unlock();
 
-
-       return (nRead >= 0) ? nRead : -1;
-
+       return (totalWritten >= 0) ? totalWritten : -1;
 }
 
 int yaffs_write(int fd, const void *buf, unsigned int nbyte)
 {
-       yaffsfs_Handle *h = NULL;
-       yaffs_Object *obj = NULL;
-       int pos = 0;
-       int nWritten = -1;
-       int writeThrough = 0;
-
-       yaffsfs_Lock();
-       h = yaffsfs_GetHandlePointer(fd);
-       obj = yaffsfs_GetHandleObject(fd);
-
-       if(!h || !obj)
-       {
-               // bad handle
-               yaffsfs_SetError(-EBADF);
-       }
-       else if( h && obj && h->readOnly)
-       {
-               // todo error
-       }
-       else if( h && obj)
-       {
-               if(h->append)
-               {
-                       pos =  yaffs_GetObjectFileLength(obj);
-               }
-               else
-               {
-                       pos = h->position;
-               }
-
-               nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
-
-               if(nWritten >= 0)
-               {
-                       h->position = pos + nWritten;
-               }
-               else
-               {
-                       //todo error
-               }
-
-       }
-
-       yaffsfs_Unlock();
-
-
-       return (nWritten >= 0) ? nWritten : -1;
-
+       return yaffsfs_do_write(fd, buf, nbyte, 0, 0);
 }
 
 int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offset)
 {
-       yaffsfs_Handle *h = NULL;
-       yaffs_Object *obj = NULL;
-       int pos = 0;
-       int nWritten = -1;
-       int writeThrough = 0;
-
-       yaffsfs_Lock();
-       h = yaffsfs_GetHandlePointer(fd);
-       obj = yaffsfs_GetHandleObject(fd);
-
-       if(!h || !obj)
-       {
-               // bad handle
-               yaffsfs_SetError(-EBADF);
-       }
-       else if( h && obj && h->readOnly)
-       {
-               // todo error
-       }
-       else if( h && obj)
-       {
-               pos = offset;
-
-                nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
-
-                if(nWritten < 0 || ((unsigned int)nWritten) < nbyte)
-                        yaffsfs_SetError(-ENOSPC);
-
-        }
-
-       yaffsfs_Unlock();
-
-
-       return (nWritten >= 0) ? nWritten : -1;
-
+       return yaffsfs_do_write(fd, buf, nbyte, 1, offset);
 }
 
 
@@ -864,17 +945,13 @@ int yaffs_truncate(const YCHAR *path,off_t newSize)
                obj = yaffs_GetEquivalentObject(obj);
 
        if(!obj)
-       {
                yaffsfs_SetError(-ENOENT);
-       }
        else if(obj->variantType != YAFFS_OBJECT_TYPE_FILE)
-       {
                yaffsfs_SetError(-EISDIR);
-       }
+       else if(obj->myDev->readOnly)
+               yaffsfs_SetError(-EINVAL);
        else
-       {
                result = yaffs_ResizeFile(obj,newSize);
-       }
 
        yaffsfs_Unlock();
 
@@ -893,15 +970,13 @@ int yaffs_ftruncate(int fd, off_t newSize)
        obj = yaffsfs_GetHandleObject(fd);
 
        if(!h || !obj)
-       {
-               // bad handle
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
-       }
+       else if(obj->myDev->readOnly)
+               yaffsfs_SetError(-EINVAL);
        else
-       {
-               // resize the file
+               /* resize the file */
                result = yaffs_ResizeFile(obj,newSize);
-       }
        yaffsfs_Unlock();
 
 
@@ -921,40 +996,26 @@ off_t yaffs_lseek(int fd, off_t offset, int whence)
        obj = yaffsfs_GetHandleObject(fd);
 
        if(!h || !obj)
-       {
-               // bad handle
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
-       }
-       else if(whence == SEEK_SET)
-       {
+       else if(whence == SEEK_SET){
                if(offset >= 0)
-               {
                        pos = offset;
-               }
        }
-       else if(whence == SEEK_CUR)
-       {
+       else if(whence == SEEK_CUR) {
                if( (h->position + offset) >= 0)
-               {
                        pos = (h->position + offset);
-               }
        }
-       else if(whence == SEEK_END)
-       {
+       else if(whence == SEEK_END) {
                fSize = yaffs_GetObjectFileLength(obj);
                if(fSize >= 0 && (fSize + offset) >= 0)
-               {
                        pos = fSize + offset;
-               }
        }
 
        if(pos >= 0)
-       {
                h->position = pos;
-       }
-       else
-       {
-               // todo error
+       else {
+               /* todo error */
        }
 
 
@@ -976,34 +1037,25 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
        obj = yaffsfs_FindObject(NULL,path,0);
        dir = yaffsfs_FindDirectory(NULL,path,&name,0);
        if(!dir)
-       {
                yaffsfs_SetError(-ENOTDIR);
-       }
        else if(!obj)
-       {
                yaffsfs_SetError(-ENOENT);
-       }
+       else if(obj->myDev->readOnly)
+               yaffsfs_SetError(-EINVAL);
        else if(!isDirectory && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
-       {
                yaffsfs_SetError(-EISDIR);
-       }
        else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-       {
                yaffsfs_SetError(-ENOTDIR);
-       }
-       else
-       {
+       else {
                result = yaffs_Unlink(dir,name);
 
                if(result == YAFFS_FAIL && isDirectory)
-               {
                        yaffsfs_SetError(-ENOTEMPTY);
-               }
        }
 
        yaffsfs_Unlock();
 
-       // todo error
+       /* todo error */
 
        return (result == YAFFS_FAIL) ? -1 : 0;
 }
@@ -1035,102 +1087,336 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
        newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
        obj = yaffsfs_FindObject(NULL,oldPath,0);
 
-       if(!olddir || !newdir || !obj)
-       {
-               // bad file
+       if(!olddir || !newdir || !obj) {
+               /* bad file */
                yaffsfs_SetError(-EBADF);
                renameAllowed = 0;
-       }
-       else if(olddir->myDev != newdir->myDev)
-       {
-               // oops must be on same device
-               // todo error
+       } else if(obj->myDev->readOnly){
+               yaffsfs_SetError(-EINVAL);
+               renameAllowed = 0;
+       } else if(olddir->myDev != newdir->myDev) {
+               /* oops must be on same device */
+               /* todo error */
                yaffsfs_SetError(-EXDEV);
                renameAllowed = 0;
-       }
-       else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
-       {
-               // It is a directory, check that it is not being renamed to
-               // being its own decendent.
-               // Do this by tracing from the new directory back to the root, checking for obj
+       } else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) {
+               /*
+                * It is a directory, check that it is not being renamed to
+                * being its own decendent.
+                * Do this by tracing from the new directory back to the root, checking for obj
+                */
 
                yaffs_Object *xx = newdir;
 
-               while( renameAllowed && xx)
-               {
+               while( renameAllowed && xx){
                        if(xx == obj)
-                       {
                                renameAllowed = 0;
-                       }
                        xx = xx->parent;
                }
-               if(!renameAllowed) yaffsfs_SetError(-EACCES);
+               if(!renameAllowed)
+                       yaffsfs_SetError(-EACCES);
        }
 
        if(renameAllowed)
-       {
                result = yaffs_RenameObject(olddir,oldname,newdir,newname);
-       }
 
        yaffsfs_Unlock();
 
        return (result == YAFFS_FAIL) ? -1 : 0;
 }
 
-
-static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
+
+static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
+{
+       int retVal = -1;
+
+       if(obj)
+               obj = yaffs_GetEquivalentObject(obj);
+
+       if(obj && buf){
+               buf->st_dev = (int)obj->myDev->osContext;
+               buf->st_ino = obj->objectId;
+               buf->st_mode = obj->yst_mode & ~S_IFMT; /* clear out file type bits */
+
+               if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+                       buf->st_mode |= S_IFDIR;
+               else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
+                       buf->st_mode |= S_IFLNK;
+               else if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+                       buf->st_mode |= S_IFREG;
+
+               buf->st_nlink = yaffs_GetObjectLinkCount(obj);
+               buf->st_uid = 0;
+               buf->st_gid = 0;;
+               buf->st_rdev = obj->yst_rdev;
+               buf->st_size = yaffs_GetObjectFileLength(obj);
+               buf->st_blksize = obj->myDev->nDataBytesPerChunk;
+               buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize;
+#if CONFIG_YAFFS_WINCE
+               buf->yst_wince_atime[0] = obj->win_atime[0];
+               buf->yst_wince_atime[1] = obj->win_atime[1];
+               buf->yst_wince_ctime[0] = obj->win_ctime[0];
+               buf->yst_wince_ctime[1] = obj->win_ctime[1];
+               buf->yst_wince_mtime[0] = obj->win_mtime[0];
+               buf->yst_wince_mtime[1] = obj->win_mtime[1];
+#else
+               buf->yst_atime = obj->yst_atime;
+               buf->yst_ctime = obj->yst_ctime;
+               buf->yst_mtime = obj->yst_mtime;
+#endif
+               retVal = 0;
+       }
+       return retVal;
+}
+
+static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_FindObject(NULL,path,0);
+
+       if(!doLStat && obj)
+               obj = yaffsfs_FollowLink(obj,0);
+
+       if(obj)
+               retVal = yaffsfs_DoStat(obj,buf);
+       else
+               /* todo error not found */
+               yaffsfs_SetError(-ENOENT);
+
+       yaffsfs_Unlock();
+
+       return retVal;
+
+}
+
+int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf)
+{
+       return yaffsfs_DoStatOrLStat(path,buf,0);
+}
+
+int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf)
+{
+       return yaffsfs_DoStatOrLStat(path,buf,1);
+}
+
+int yaffs_fstat(int fd, struct yaffs_stat *buf)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_GetHandleObject(fd);
+
+       if(obj)
+               retVal = yaffsfs_DoStat(obj,buf);
+       else
+               /* bad handle */
+               yaffsfs_SetError(-EBADF);
+
+       yaffsfs_Unlock();
+
+       return retVal;
+}
+
+#ifndef CONFIG_YAFFS_WINCE
+/* xattrib functions */
+
+
+static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_FindObject(NULL,path,0);
+
+       if(follow)
+               obj = yaffsfs_FollowLink(obj,0);
+
+       if(obj) {
+               retVal = yaffs_SetXAttribute(obj,name,data,size,flags);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
+               }
+       } else
+               /* todo error not found */
+               yaffsfs_SetError(-ENOENT);
+
+       yaffsfs_Unlock();
+
+       return retVal;
+
+}
+
+int yaffs_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags)
+{
+       return yaffs_do_setxattr(path, name, data, size, flags, 1);
+}
+
+int yaffs_lsetxattr(const YCHAR *path, const char *name, const void *data, int size, int flags)
+{
+       return yaffs_do_setxattr(path, name, data, size, flags, 0);
+}
+
+
+
+int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int flags)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_GetHandleObject(fd);
+
+       if(obj) {
+               retVal = yaffs_SetXAttribute(obj,name,data,size,flags);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
+               }
+       } else
+               /* bad handle */
+               yaffsfs_SetError(-EBADF);
+
+       yaffsfs_Unlock();
+
+       return retVal;
+}
+
+static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_FindObject(NULL,path,0);
+
+       if(follow)
+               obj = yaffsfs_FollowLink(obj,0);
+
+       if(obj) {
+               retVal = yaffs_GetXAttribute(obj,name,data,size);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
+               }
+       } else
+               /* todo error not found */
+               yaffsfs_SetError(-ENOENT);
+
+       yaffsfs_Unlock();
+
+       return retVal;
+
+}
+
+int yaffs_getxattr(const YCHAR *path, const char *name, void *data, int size)
+{
+       return yaffs_do_getxattr( path, name, data, size, 1);
+}
+int yaffs_lgetxattr(const YCHAR *path, const char *name, void *data, int size)
+{
+       return yaffs_do_getxattr( path, name, data, size, 0);
+}
+
+
+
+int yaffs_fgetxattr(int fd, const char *name, void *data, int size)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_GetHandleObject(fd);
+
+       if(obj) {
+               retVal = yaffs_GetXAttribute(obj,name,data,size);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
+               }
+       } else
+               /* bad handle */
+               yaffsfs_SetError(-EBADF);
+
+       yaffsfs_Unlock();
+
+       return retVal;
+}
+
+static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_FindObject(NULL,path,0);
+
+       if(follow)
+               obj = yaffsfs_FollowLink(obj,0);
+
+       if(obj) {
+               retVal = yaffs_ListXAttributes(obj, data,size);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
+               }
+       } else
+               /* todo error not found */
+               yaffsfs_SetError(-ENOENT);
+
+       yaffsfs_Unlock();
+
+       return retVal;
+
+}
+
+int yaffs_listxattr(const YCHAR *path, char *data, int size)
+{
+       return yaffs_do_listxattr(path, data, size, 1);
+}
+
+int yaffs_llistxattr(const YCHAR *path, char *data, int size)
+{
+       return yaffs_do_listxattr(path, data, size, 0);
+}
+
+int yaffs_flistxattr(int fd, char *data, int size)
 {
-       int retVal = -1;
+       yaffs_Object *obj;
 
-       if(obj)
-       {
-               obj = yaffs_GetEquivalentObject(obj);
-       }
+       int retVal = -1;
 
-       if(obj && buf)
-       {
-       buf->st_dev = (int)obj->myDev->genericDevice;
-       buf->st_ino = obj->objectId;
-       buf->st_mode = obj->yst_mode & ~S_IFMT; // clear out file type bits
+       yaffsfs_Lock();
+       obj = yaffsfs_GetHandleObject(fd);
 
-               if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
-               {
-                       buf->st_mode |= S_IFDIR;
-               }
-               else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-               {
-                       buf->st_mode |= S_IFLNK;
-               }
-               else if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-               {
-                       buf->st_mode |= S_IFREG;
+       if(obj) {
+               retVal = yaffs_ListXAttributes(obj,data,size);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
                }
+       } else
+               /* bad handle */
+               yaffsfs_SetError(-EBADF);
+
+       yaffsfs_Unlock();
 
-       buf->st_nlink = yaffs_GetObjectLinkCount(obj);
-       buf->st_uid = 0;
-       buf->st_gid = 0;;
-       buf->st_rdev = obj->yst_rdev;
-       buf->st_size = yaffs_GetObjectFileLength(obj);
-               buf->st_blksize = obj->myDev->nDataBytesPerChunk;
-       buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize;
-#if CONFIG_YAFFS_WINCE
-               buf->yst_wince_atime[0] = obj->win_atime[0];
-               buf->yst_wince_atime[1] = obj->win_atime[1];
-               buf->yst_wince_ctime[0] = obj->win_ctime[0];
-               buf->yst_wince_ctime[1] = obj->win_ctime[1];
-               buf->yst_wince_mtime[0] = obj->win_mtime[0];
-               buf->yst_wince_mtime[1] = obj->win_mtime[1];
-#else
-       buf->yst_atime = obj->yst_atime;
-       buf->yst_ctime = obj->yst_ctime;
-       buf->yst_mtime = obj->yst_mtime;
-#endif
-               retVal = 0;
-       }
        return retVal;
 }
 
-static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
+static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
 {
        yaffs_Object *obj;
 
@@ -1139,20 +1425,18 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
 
-       if(!doLStat && obj)
-       {
+       if(follow)
                obj = yaffsfs_FollowLink(obj,0);
-       }
 
-       if(obj)
-       {
-               retVal = yaffsfs_DoStat(obj,buf);
-       }
-       else
-       {
-               // todo error not found
+       if(obj) {
+               retVal = yaffs_RemoveXAttribute(obj,name);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
+               }
+       } else
+               /* todo error not found */
                yaffsfs_SetError(-ENOENT);
-       }
 
        yaffsfs_Unlock();
 
@@ -1160,17 +1444,17 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d
 
 }
 
-int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf)
+int yaffs_removexattr(const YCHAR *path, const char *name)
 {
-       return yaffsfs_DoStatOrLStat(path,buf,0);
+       return yaffs_do_removexattr(path, name, 1);
 }
 
-int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf)
+int yaffs_lremovexattr(const YCHAR *path, const char *name)
 {
-       return yaffsfs_DoStatOrLStat(path,buf,1);
+       return yaffs_do_removexattr(path, name, 0);
 }
 
-int yaffs_fstat(int fd, struct yaffs_stat *buf)
+int yaffs_fremovexattr(int fd, const char *name)
 {
        yaffs_Object *obj;
 
@@ -1179,20 +1463,21 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf)
        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
 
-       if(obj)
-       {
-               retVal = yaffsfs_DoStat(obj,buf);
-       }
-       else
-       {
-               // bad handle
+       if(obj){
+               retVal = yaffs_RemoveXAttribute(obj,name);
+               if(retVal< 0){
+                       yaffsfs_SetError(retVal);
+                       retVal = -1;
+               }
+       }else
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
-       }
 
        yaffsfs_Unlock();
 
        return retVal;
 }
+#endif
 
 #ifdef CONFIG_YAFFS_WINCE
 int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime)
@@ -1204,8 +1489,7 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *
        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
 
-       if(obj)
-       {
+       if(obj){
 
                if(wctime){
                        wctime[0] = obj->win_ctime[0];
@@ -1222,12 +1506,9 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *
 
 
                retVal = 0;
-       }
-       else
-       {
-               // bad handle
+       } else
+               /*  bad handle */
                yaffsfs_SetError(-EBADF);               
-       }
        
        yaffsfs_Unlock();
        
@@ -1247,8 +1528,7 @@ int yaffs_set_wince_times(int fd,
         yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
 
-       if(obj)
-       {
+       if(obj){
 
                if(wctime){
                        obj->win_ctime[0] = wctime[0];
@@ -1264,14 +1544,11 @@ int yaffs_set_wince_times(int fd,
                 }
 
                 obj->dirty = 1;
-                result = yaffs_FlushFile(obj,0);
+                result = yaffs_FlushFile(obj,0,0);
                 retVal = 0;
-        }
-        else
-       {
-               // bad handle
+        } else
+               /* bad handle */
                yaffsfs_SetError(-EBADF);
-       }
 
        yaffsfs_Unlock();
 
@@ -1283,18 +1560,15 @@ int yaffs_set_wince_times(int fd,
 
 static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode)
 {
-       int result;
+       int result = -1;
 
        if(obj)
-       {
                obj = yaffs_GetEquivalentObject(obj);
-       }
 
-       if(obj)
-       {
+       if(obj) {
                obj->yst_mode = mode;
                obj->dirty = 1;
-               result = yaffs_FlushFile(obj,0);
+               result = yaffs_FlushFile(obj,0,0);
        }
 
        return result == YAFFS_OK ? 0 : -1;
@@ -1310,8 +1584,7 @@ int yaffs_access(const YCHAR *path, int amode)
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
 
-       if(obj)
-       {
+       if(obj) {
                int access_ok = 1;
 
                if((amode & R_OK) && !(obj->yst_mode & S_IREAD))
@@ -1325,10 +1598,8 @@ int yaffs_access(const YCHAR *path, int amode)
                        yaffsfs_SetError(-EACCES);
                        retval = -1;
                }
-       }
-       else
-       {
-               // todo error not found
+       } else {
+               /* todo error not found */
                yaffsfs_SetError(-ENOENT);
                retval = -1;
        }
@@ -1349,15 +1620,12 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
 
-       if(obj)
-       {
-               retVal = yaffsfs_DoChMod(obj,mode);
-       }
-       else
-       {
-               // todo error not found
+       if(!obj)
                yaffsfs_SetError(-ENOENT);
-       }
+       else if(obj->myDev->readOnly)
+               yaffsfs_SetError(-EINVAL);
+       else
+               retVal = yaffsfs_DoChMod(obj,mode);
 
        yaffsfs_Unlock();
 
@@ -1375,15 +1643,12 @@ int yaffs_fchmod(int fd, mode_t mode)
        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
 
-       if(obj)
-       {
-               retVal = yaffsfs_DoChMod(obj,mode);
-       }
+       if(!obj)
+               yaffsfs_SetError(-ENOENT);
+       else if(obj->myDev->readOnly)
+               yaffsfs_SetError(-EINVAL);
        else
-       {
-               // bad handle
-               yaffsfs_SetError(-EBADF);
-       }
+               retVal = yaffsfs_DoChMod(obj,mode);
 
        yaffsfs_Unlock();
 
@@ -1400,23 +1665,25 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,path,&name,0);
-       if(parent)
-               dir = yaffs_MknodDirectory(parent,name,mode,0,0);
-       if(dir)
-       {
-               retVal = 0;
-       }
-       else
-       {
-               if(!parent){
-                       yaffsfs_SetError(-ENOENT); // missing path
-               }
-               else if (yaffs_FindObjectByName(parent,name)){
-                       yaffsfs_SetError(-EEXIST); // the name already exists
+       if(parent && yaffs_strnlen(name,5) == 0){
+               /* Trying to make the root itself */
+               yaffsfs_SetError(-EEXIST);
+       } else if(parent && parent->myDev->readOnly){
+               yaffsfs_SetError(-EINVAL);
+       } else {
+               if(parent)
+                       dir = yaffs_MknodDirectory(parent,name,mode,0,0);
+               if(dir)
+                       retVal = 0;
+               else {
+                       if(!parent)
+                               yaffsfs_SetError(-ENOENT); /* missing path */
+                       else if (yaffs_FindObjectByName(parent,name))
+                               yaffsfs_SetError(-EEXIST); /* the name already exists */
+                       else
+                               yaffsfs_SetError(-ENOSPC); /* just assume no space */
+                       retVal = -1;
                }
-               else
-                       yaffsfs_SetError(-ENOSPC); // just assume no space
-               retVal = -1;
        }
 
        yaffsfs_Unlock();
@@ -1424,7 +1691,15 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
        return retVal;
 }
 
-int yaffs_mount(const YCHAR *path)
+void * yaffs_getdev(const YCHAR *path)
+{
+       yaffs_Device *dev=NULL;
+       YCHAR *dummy;
+       dev = yaffsfs_FindDevice(path,&dummy);
+       return (void *)dev;
+}
+
+int yaffs_mount2(const YCHAR *path,int readOnly)
 {
        int retVal=-1;
        int result=YAFFS_FAIL;
@@ -1434,36 +1709,37 @@ int yaffs_mount(const YCHAR *path)
        T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
 
        yaffsfs_Lock();
+
+       yaffsfs_InitHandles();
+
        dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev)
-       {
-               if(!dev->isMounted)
-               {
+       if(dev){
+               if(!dev->isMounted){
+                       dev->readOnly = readOnly ? 1 : 0;
                        result = yaffs_GutsInitialise(dev);
                        if(result == YAFFS_FAIL)
-                       {
-                               // todo error - mount failed
+                               /* todo error - mount failed */
                                yaffsfs_SetError(-ENOMEM);
-                       }
                        retVal = result ? 0 : -1;
 
                }
                else
-               {
-                       //todo error - already mounted.
+                       /* todo error - already mounted. */
                        yaffsfs_SetError(-EBUSY);
-               }
-       }
-       else
-       {
-               // todo error - no device
+       } else
+               /* todo error - no device */
                yaffsfs_SetError(-ENODEV);
-       }
+
        yaffsfs_Unlock();
        return retVal;
 
 }
 
+int yaffs_mount(const YCHAR *path)
+{
+       return yaffs_mount2(path,0);
+}
+
 int yaffs_sync(const YCHAR *path)
 {
         int retVal=-1;
@@ -1472,34 +1748,27 @@ int yaffs_sync(const YCHAR *path)
         
         yaffsfs_Lock();
         dev = yaffsfs_FindDevice(path,&dummy);
-        if(dev)
-        {
-                if(dev->isMounted)
-                {
+        if(dev){
+                if(dev->isMounted){
                         
                         yaffs_FlushEntireDeviceCache(dev);
                         yaffs_CheckpointSave(dev);
+                        retVal = 0;
                         
-                        
-                }
-                else
-                {
-                        //todo error - not mounted.
+                } else
+                        /* todo error - not mounted. */
                         yaffsfs_SetError(-EINVAL);
                         
-                }
-        }
-        else
-        {
-                // todo error - no device
+        }else
+                /* todo error - no device */
                 yaffsfs_SetError(-ENODEV);
-        }       
+
         yaffsfs_Unlock();
         return retVal;  
 }
 
 
-int yaffs_unmount(const YCHAR *path)
+int yaffs_remount(const YCHAR *path, int force, int readOnly)
 {
         int retVal=-1;
        yaffs_Device *dev=NULL;
@@ -1507,54 +1776,86 @@ int yaffs_unmount(const YCHAR *path)
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev)
-       {
-               if(dev->isMounted)
-               {
+       if(dev){
+               if(dev->isMounted){
+                       int i;
+                       int inUse;
+
+                       yaffs_FlushEntireDeviceCache(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->myDev == dev)
+                                       inUse = 1; /* the device is in use, can't unmount */
+                       }
+
+                       if(!inUse || force){
+                               if(readOnly)
+                                       yaffs_CheckpointSave(dev);
+                               dev->readOnly =  readOnly ? 1 : 0;
+                               retVal = 0;
+                       } else
+                               yaffsfs_SetError(-EBUSY);
+
+               } else
+                       yaffsfs_SetError(-EINVAL);
+
+       }
+       else
+               yaffsfs_SetError(-ENODEV);
+
+       yaffsfs_Unlock();
+       return retVal;
+
+}
+
+int yaffs_unmount2(const YCHAR *path, int force)
+{
+        int retVal=-1;
+       yaffs_Device *dev=NULL;
+       YCHAR *dummy;
+
+       yaffsfs_Lock();
+       dev = yaffsfs_FindDevice(path,&dummy);
+       if(dev){
+               if(dev->isMounted){
                        int i;
                        int inUse;
 
                        yaffs_FlushEntireDeviceCache(dev);
                        yaffs_CheckpointSave(dev);
 
-                       for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++)
-                       {
-                               if(yaffsfs_handle[i].inUse && yaffsfs_handle[i].obj->myDev == dev)
-                               {
-                                       inUse = 1; // the device is in use, can't unmount
-                               }
+                       for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){
+                               if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev)
+                                       inUse = 1; /* the device is in use, can't unmount */
                        }
 
-                       if(!inUse)
-                       {
+                       if(!inUse || force){
                                yaffs_Deinitialise(dev);
 
                                retVal = 0;
-                       }
-                       else
-                       {
-                               // todo error can't unmount as files are open
+                       } else
+                               /* todo error can't unmount as files are open */
                                yaffsfs_SetError(-EBUSY);
-                       }
 
-               }
-               else
-               {
-                       //todo error - not mounted.
+               } else
+                       /* todo error - not mounted. */
                        yaffsfs_SetError(-EINVAL);
 
-               }
        }
        else
-       {
-               // todo error - no device
+               /* todo error - no device */
                yaffsfs_SetError(-ENODEV);
-       }
+
        yaffsfs_Unlock();
        return retVal;
 
 }
 
+int yaffs_unmount(const YCHAR *path)
+{
+       return yaffs_unmount2(path,0);
+}
+
 loff_t yaffs_freespace(const YCHAR *path)
 {
        loff_t retVal=-1;
@@ -1563,16 +1864,12 @@ loff_t yaffs_freespace(const YCHAR *path)
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev  && dev->isMounted)
-       {
+       if(dev  && dev->isMounted){
                retVal = yaffs_GetNumberOfFreeChunks(dev);
                retVal *= dev->nDataBytesPerChunk;
 
-       }
-       else
-       {
+       } else
                yaffsfs_SetError(-EINVAL);
-       }
 
        yaffsfs_Unlock();
        return retVal;
@@ -1586,53 +1883,66 @@ loff_t yaffs_totalspace(const YCHAR *path)
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev  && dev->isMounted)
-       {
-               retVal = (dev->endBlock - dev->startBlock + 1) - dev->nReservedBlocks;
-               retVal *= dev->nChunksPerBlock;
+       if(dev  && dev->isMounted){
+               retVal = (dev->param.endBlock - dev->param.startBlock + 1) - dev->param.nReservedBlocks;
+               retVal *= dev->param.nChunksPerBlock;
                retVal *= dev->nDataBytesPerChunk;
 
-       }
-       else
-       {
+       } else
                yaffsfs_SetError(-EINVAL);
-       }
 
        yaffsfs_Unlock();
        return retVal;
 }
 
-
-
-void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList)
+int yaffs_inodecount(const YCHAR *path)
 {
+       loff_t retVal= -1;
+       yaffs_Device *dev=NULL;
+       YCHAR *dummy;
 
-       yaffsfs_DeviceConfiguration *cfg;
-
-       yaffsfs_configurationList = cfgList;
+       yaffsfs_Lock();
+       dev = yaffsfs_FindDevice(path,&dummy);
+       if(dev  && dev->isMounted) {
+          int nObjects = dev->nObjects;
+          if(nObjects > dev->nHardLinks)
+               retVal = nObjects - dev->nHardLinks;
+       }
+       
+       if(retVal < 0)
+               yaffsfs_SetError(-EINVAL);
+       
+       yaffsfs_Unlock();
+       return retVal;  
+}
 
-       yaffsfs_InitHandles();
 
-       cfg = yaffsfs_configurationList;
+void yaffs_AddDevice(yaffs_Device *dev)
+{
+       dev->isMounted = 0;
+       dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
 
-       while(cfg && cfg->prefix && cfg->dev)
-       {
-               cfg->dev->isMounted = 0;
-               cfg->dev->removeObjectCallback = yaffsfs_RemoveObjectCallback;
-               cfg++;
-       }
+       if(!dev->devList.next)
+               YINIT_LIST_HEAD(&dev->devList);
 
+       ylist_add(&dev->devList,&yaffsfs_deviceList);
+}
 
+void yaffs_RemoveDevice(yaffs_Device *dev)
+{
+       ylist_del_init(&dev->devList);
 }
 
 
-//
-// Directory search stuff.
 
-//
-// Directory search context
-//
-// NB this is an opaque structure.
+
+/* Directory search stuff. */
+
+/*
+ * Directory search context
+ *
+ * NB this is an opaque structure.
+ */
 
 
 typedef struct
@@ -1659,12 +1969,11 @@ static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc)
 
            dsc->offset = 0;
 
-           if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
+           if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children))
                 dsc->nextReturn = NULL;
-           } else {
+           else
                 dsc->nextReturn = ylist_entry(dsc->dirObj->variant.directoryVariant.children.next,
                                                 yaffs_Object,siblings);
-           }
         } else {
                /* Hey someone isn't playing nice! */
        }
@@ -1677,9 +1986,9 @@ static void yaffsfs_DirAdvance(yaffsfs_DirectorySearchContext *dsc)
            dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
 
            if( dsc->nextReturn == NULL ||
-               ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
+               ylist_empty(&dsc->dirObj->variant.directoryVariant.children))
                 dsc->nextReturn = NULL;
-           else {
+           else {
                    struct ylist_head *next = dsc->nextReturn->siblings.next;
 
                    if( next == &dsc->dirObj->variant.directoryVariant.children)
@@ -1726,13 +2035,12 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 
        obj = yaffsfs_FindObject(NULL,dirname,0);
 
-       if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
-       {
+       if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
 
                dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
                dir = (yaffs_DIR *)dsc;
-               if(dsc)
-               {
+
+               if(dsc){
                        memset(dsc,0,sizeof(yaffsfs_DirectorySearchContext));
                         dsc->magic = YAFFS_MAGIC;
                         dsc->dirObj = obj;
@@ -1743,7 +2051,8 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
                                 YINIT_LIST_HEAD(&search_contexts);
 
                         ylist_add(&dsc->others,&search_contexts);       
-                        yaffsfs_SetDirRewound(dsc);             }
+                        yaffsfs_SetDirRewound(dsc);
+               }
 
         }
 
@@ -1766,9 +2075,9 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
                        dsc->de.d_dont_use = (unsigned)dsc->nextReturn;
                        dsc->de.d_off = dsc->offset++;
                        yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX);
-                       if(yaffs_strlen(dsc->de.d_name) == 0)
+                       if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0)
                        {
-                               // this should not happen!
+                               /* this should not happen! */
                                yaffs_strcpy(dsc->de.d_name,_Y("zz"));
                        }
                        dsc->de.d_reclen = sizeof(struct yaffs_dirent);
@@ -1776,11 +2085,8 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
                        yaffsfs_DirAdvance(dsc);
                } else
                        retVal = NULL;
-       }
-       else
-       {
+       } else
                yaffsfs_SetError(-EBADF);
-       }
 
        yaffsfs_Unlock();
 
@@ -1813,7 +2119,7 @@ int yaffs_closedir(yaffs_DIR *dirp)
         return 0;
 }
 
-// end of directory stuff
+/* End of directory stuff */
 
 
 int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
@@ -1822,18 +2128,22 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
        yaffs_Object *obj;
        YCHAR *name;
        int retVal= -1;
-       int mode = 0; // ignore for now
+       int mode = 0; /* ignore for now */
 
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
-       obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath);
-       if(obj)
-       {
-               retVal = 0;
-       }
-       else
-       {
-               yaffsfs_SetError(-ENOSPC); // just assume no space for now
+       if(parent && parent->myDev->readOnly)
+               yaffsfs_SetError(-EINVAL);
+       else if(parent){
+               obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath);
+               if(obj)
+                       retVal = 0;
+               else{
+                       yaffsfs_SetError(-ENOSPC); /* just assume no space for now */
+                       retVal = -1;
+               }
+       } else {
+               yaffsfs_SetError(-EINVAL);
                retVal = -1;
        }
 
@@ -1853,18 +2163,13 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 
        obj = yaffsfs_FindObject(NULL,path,0);
 
-       if(!obj)
-       {
+       if(!obj) {
                yaffsfs_SetError(-ENOENT);
                retVal = -1;
-       }
-       else if(obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK)
-       {
+       } else if(obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK) {
                yaffsfs_SetError(-EINVAL);
                retVal = -1;
-       }
-       else
-       {
+       } else {
                YCHAR *alias = obj->variant.symLinkVariant.alias;
                memset(buf,0,bufsiz);
                yaffs_strncpy(buf,alias,bufsiz - 1);
@@ -1876,10 +2181,11 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 
 int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
 {
-       // Creates a link called newpath to existing oldpath
+       /* Creates a link called newpath to existing oldpath */
        yaffs_Object *obj = NULL;
        yaffs_Object *target = NULL;
        int retVal = 0;
+       int newNameLength = 0;
 
 
        yaffsfs_Lock();
@@ -1887,18 +2193,16 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
        obj = yaffsfs_FindObject(NULL,oldpath,0);
        target = yaffsfs_FindObject(NULL,newpath,0);
 
-       if(!obj)
-       {
+       if(!obj) {
                yaffsfs_SetError(-ENOENT);
                retVal = -1;
-       }
-       else if(target)
-       {
+       } else if(obj->myDev->readOnly){
+               yaffsfs_SetError(-EINVAL);
+               retVal= -1;
+       } else if(target) {
                yaffsfs_SetError(-EEXIST);
                retVal = -1;
-       }
-       else
-       {
+       } else {
                yaffs_Object *newdir = NULL;
                yaffs_Object *link = NULL;
 
@@ -1906,23 +2210,29 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
 
                newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0);
 
-               if(!newdir)
-               {
+               if(!newdir){
                        yaffsfs_SetError(-ENOTDIR);
                        retVal = -1;
-               }
-               else if(newdir->myDev != obj->myDev)
-               {
+               }else if(newdir->myDev != obj->myDev){
                        yaffsfs_SetError(-EXDEV);
                        retVal = -1;
                }
-               if(newdir && yaffs_strlen(newname) > 0)
-               {
+               
+               newNameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1);
+               
+               if(newNameLength == 0){
+                       yaffsfs_SetError(-ENOENT);
+                       retVal = -1;
+               } else if (newNameLength > YAFFS_MAX_NAME_LENGTH){
+                       yaffsfs_SetError(-ENAMETOOLONG);
+                       retVal = -1;
+               }
+               
+               if(retVal == 0) {
                        link = yaffs_Link(newdir,newname,obj);
                        if(link)
                                retVal = 0;
-                       else
-                       {
+                       else{
                                yaffsfs_SetError(-ENOSPC);
                                retVal = -1;
                        }
@@ -1934,7 +2244,27 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
        return retVal;
 }
 
-int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev);
+int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
+{
+       return -1;
+}
+
+
+
+/*
+ * yaffs_n_handles()
+ * Returns number of handles attached to the object
+ */
+int yaffs_n_handles(const YCHAR *path)
+{
+       yaffs_Object *obj;
+
+       obj = yaffsfs_FindObject(NULL,path,0);
+       if(obj)
+               obj = yaffs_GetEquivalentObject(obj);
+
+       return yaffsfs_CountHandles(obj);
+}
 
 int yaffs_DumpDevStruct(const YCHAR *path)
 {
@@ -1943,8 +2273,7 @@ int yaffs_DumpDevStruct(const YCHAR *path)
 
        yaffs_Object *obj = yaffsfs_FindRoot(path,&rest);
 
-       if(obj)
-       {
+       if(obj){
                yaffs_Device *dev = obj->myDev;
 
                printf("\n"