#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;
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);
+ }
+}
+
/*
* 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
*/
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)
{
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;
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;
int yaffs_chmod(const YCHAR *path, mode_t mode)
{
struct yaffs_obj *obj;
-
int retVal = -1;
+ if(mode & ~(0777)){
+ yaffsfs_SetError(-EINVAL);
+ return -1;
+ }
+
yaffsfs_Lock();
obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj)
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
- yaffsfs_SetError(-EINVAL);
+ yaffsfs_SetError(-EROFS);
else
retVal = yaffsfs_DoChMod(obj,mode);
int yaffs_fchmod(int fd, mode_t mode)
{
struct yaffs_obj *obj;
-
int retVal = -1;
+ if(mode & ~(0777)){
+ yaffsfs_SetError(-EINVAL);
+ return -1;
+ }
+
yaffsfs_Lock();
obj = yaffsfs_GetHandleObject(fd);
if(!obj)
- yaffsfs_SetError(-ENOENT);
+ yaffsfs_SetError(-EBADF);
else if(obj->my_dev->read_only)
- yaffsfs_SetError(-EINVAL);
+ yaffsfs_SetError(-EROFS);
else
retVal = yaffsfs_DoChMod(obj,mode);
int retVal=-1;
int result=YAFFS_FAIL;
struct yaffs_dev *dev=NULL;
- YCHAR *restOfPath;
T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
yaffsfs_InitHandles();
- dev = yaffsfs_FindDevice(path,&restOfPath);
- if(dev && !(*restOfPath)){
+ dev = yaffsfs_FindMountPoint(path);
+ if(dev){
if(!dev->is_mounted){
dev->read_only = read_only ? 1 : 0;
result = yaffs_guts_initialise(dev);
{
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;
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 */
}
{
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;
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;
/* todo error - not mounted. */
yaffsfs_SetError(-EINVAL);
- }
- else
+ } else
/* todo error - no device */
yaffsfs_SetError(-ENODEV);
int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
{
+ pathname=pathname;
+ mode=mode;
+ dev=dev;
return -1;
}
int yaffs_dump_dev(const YCHAR *path)
{
-#if 0
+#if 1
+ path=path;
+#else
YCHAR *rest;
struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest);