#endif
-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.31 2010-01-11 04:06:47 charles Exp $";
+/* YAFFSFS_RW_SIZE must be a power of 2 */
+#define YAFFSFS_RW_SHIFT (13)
+#define YAFFSFS_RW_SIZE (1<<YAFFSFS_RW_SHIFT)
+
+
+const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.35 2010-02-25 22:38:03 charles Exp $";
// configurationList is the list of devices that are supported
static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
} yaffsfs_Inode;
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
- int inodeId:20; // the object
+ __u8 readOnly:1; // this handle is read only
+ __u8 append:1; // append only
+ __u8 exclusive:1; // exclusive
+ int inodeId:13; // the object
+ int useCount:16; // Use count for this handle
__u32 position; // current position in file
}yaffsfs_Handle;
{
yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
- if(h && h->inUse && h->inodeId >= 0 && h->inodeId < YAFFSFS_N_HANDLES)
+ if(h && h->useCount > 0 && h->inodeId >= 0 && h->inodeId < YAFFSFS_N_HANDLES)
return &yaffsfs_inode[h->inodeId];
return NULL;
// Grab a handle (when opening a file)
//
-static int yaffsfs_GetHandle(void)
+static int yaffsfs_GetNewHandle(void)
{
int i;
yaffsfs_Handle *h;
if(!h){
// todo bug: should never happen
}
- if(!h->inUse){
+ if(h->useCount < 1){
memset(h,0,sizeof(yaffsfs_Handle));
h->inodeId=-1;
- h->inUse=1;
+ h->useCount=1;
return i;
}
}
return -1;
}
+// 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.
+// 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){
- if(h->inodeId >= 0)
- yaffsfs_PutInode(h->inodeId);
- h->inUse = 0;
- h->inodeId = -1;
+ if(h && h->useCount > 0){
+ h->useCount--;
+ if(h->useCount < 1){
+ if(h->inodeId >= 0){
+ yaffsfs_PutInode(h->inodeId);
+ h->inodeId = -1;
+ }
+ }
}
return 0;
}
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);
yaffsfs_Lock();
- handle = yaffsfs_GetHandle();
+ handle = yaffsfs_GetNewHandle();
if(handle >= 0){
for(i = 0; i < YAFFSFS_N_HANDLES; i++){
if(i != handle &&
- yaffsfs_handle[i].inUse &&
+ yaffsfs_handle[i].useCount > 0 &&
obj == yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj){
alreadyOpen = 1;
if(yaffsfs_handle[i].exclusive)
} 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 {
yaffsfs_SetError(-ENOTDIR);
}
h->inodeId = inodeId;
- h->inUse = 1;
h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1;
h->append = (oflag & O_APPEND) ? 1 : 0;
h->exclusive = (oflag & O_EXCL) ? 1 : 0;
h = yaffsfs_GetHandlePointer(fd);
- if(h && h->inUse)
+ if(h && h->useCount > 0)
// flush the file
yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,datasync);
else {
h = yaffsfs_GetHandlePointer(fd);
- if(h && h->inUse) {
+ if(h && h->useCount > 0) {
// clean up
yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,0);
yaffsfs_PutHandle(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)
+ if(!h || !obj){
// bad handle
yaffsfs_SetError(-EBADF);
+ totalRead = -1;
+ } else if( h && obj){
+ if(isPread)
+ startPos = offset;
+ else
+ startPos = h->position;
- else if( h && obj){
- pos= h->position;
+ pos = startPos;
+
if(yaffs_GetObjectFileLength(obj) > pos)
maxRead = yaffs_GetObjectFileLength(obj) - pos;
else
nbyte = maxRead;
- if(nbyte > 0) {
- nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
- if(nRead >= 0)
- h->position = pos + nRead;
- else {
- //todo error
- }
- } else
- nRead = 0;
-
- }
-
- yaffsfs_Unlock();
-
-
- return (nRead >= 0) ? nRead : -1;
+ 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);
-int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
-{
- yaffsfs_Handle *h = NULL;
- yaffs_Object *obj = NULL;
- int pos = 0;
- int nRead = -1;
- unsigned int maxRead;
+ if(nRead > 0){
+ totalRead += nRead;
+ pos += nRead;
+ buf += nRead;
+ }
- yaffsfs_Lock();
- h = yaffsfs_GetHandlePointer(fd);
- obj = yaffsfs_GetHandleObject(fd);
+ if(nRead == nToRead)
+ nbyte-=nRead;
+ else
+ nbyte = 0; /* no more to read */
+
+
+ if(nbyte > 0){
+ yaffsfs_Unlock();
+ yaffsfs_Lock();
+ }
- if(!h || !obj)
- // bad handle
- yaffsfs_SetError(-EBADF);
- else if( h && obj) {
- pos= offset;
- if(yaffs_GetObjectFileLength(obj) > pos)
- maxRead = yaffs_GetObjectFileLength(obj) - pos;
- else
- maxRead = 0;
+ }
- if(nbyte > maxRead)
- nbyte = maxRead;
+ yaffsfs_PutHandle(fd);
+ if(!isPread) {
+ if(totalRead >= 0)
+ h->position = startPos + totalRead;
+ else {
+ //todo error
+ }
+ }
- if(nbyte > 0)
- nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
- else
- nRead = 0;
}
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_write(int fd, const void *buf, unsigned int nbyte)
+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 nWritten = -1;
+ 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)
+ if(!h || !obj){
// bad handle
yaffsfs_SetError(-EBADF);
- else if( h && obj && h->readOnly){
- // todo error
+ totalWritten = -1;
+ } else if( h && obj && (h->readOnly || obj->myDev->readOnly)){
+ yaffsfs_SetError(-EINVAL);
+ totalWritten=-1;
} else if( h && obj){
+ if(isPwrite)
+ startPos = offset;
if(h->append)
- pos = yaffs_GetObjectFileLength(obj);
+ startPos = yaffs_GetObjectFileLength(obj);
else
- pos = h->position;
+ 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;
+ }
- nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
+ if(nWritten == nToWrite)
+ nbyte -= nToWrite;
+ else
+ nbyte = 0;
- if(nWritten >= 0)
- h->position = pos + nWritten;
- else {
- //todo error
+ if(nWritten < 1 && totalWritten < 1){
+ yaffsfs_SetError(-ENOSPC);
+ totalWritten = -1;
+ }
+
+ 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 (totalWritten >= 0) ? totalWritten : -1;
+}
- return (nWritten >= 0) ? nWritten : -1;
-
+int yaffs_write(int fd, const void *buf, unsigned int nbyte)
+{
+ 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);
}
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);
if(!h || !obj)
// bad handle
yaffsfs_SetError(-EBADF);
+ else if(obj->myDev->readOnly)
+ yaffsfs_SetError(-EINVAL);
else
// resize the file
result = yaffs_ResizeFile(obj,newSize);
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)
// bad file
yaffsfs_SetError(-EBADF);
renameAllowed = 0;
+ } else if(obj->myDev->readOnly){
+ yaffsfs_SetError(-EINVAL);
+ renameAllowed = 0;
} else if(olddir->myDev != newdir->myDev) {
// oops must be on same device
// todo error
obj = yaffs_GetEquivalentObject(obj);
if(obj && buf){
- buf->st_dev = (int)obj->myDev->genericDevice;
+ buf->st_dev = (int)obj->myDev->context;
buf->st_ino = obj->objectId;
buf->st_mode = obj->yst_mode & ~S_IFMT; // clear out file type bits
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();
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();
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
- else
- yaffsfs_SetError(-ENOSPC); // just assume no space
- retVal = -1;
+ 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;
+ }
}
yaffsfs_Unlock();
return retVal;
}
-int yaffs_mount(const YCHAR *path)
+int yaffs_mount2(const YCHAR *path,int readOnly)
{
int retVal=-1;
int result=YAFFS_FAIL;
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
if(!dev->isMounted){
+ dev->readOnly = readOnly ? 1 : 0;
result = yaffs_GutsInitialise(dev);
if(result == YAFFS_FAIL)
// todo error - mount failed
}
+int yaffs_mount(const YCHAR *path)
+{
+ return yaffs_mount2(path,0);
+}
+
int yaffs_sync(const YCHAR *path)
{
int retVal=-1;
}
-int yaffs_unmount(const YCHAR *path)
+int yaffs_remount(const YCHAR *path, int force, int readOnly)
+{
+ 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);
+
+ 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;
yaffs_CheckpointSave(dev);
for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){
- if(yaffsfs_handle[i].inUse && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev)
+ 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;
}
+int yaffs_unmount(const YCHAR *path)
+{
+ return yaffs_unmount2(path,0);
+}
+
loff_t yaffs_freespace(const YCHAR *path)
{
loff_t retVal=-1;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev && dev->isMounted){
- retVal = (dev->endBlock - dev->startBlock + 1) - dev->nReservedBlocks;
- retVal *= dev->nChunksPerBlock;
+ retVal = (dev->param.endBlock - dev->param.startBlock + 1) - dev->param.nReservedBlocks;
+ retVal *= dev->param.nChunksPerBlock;
retVal *= dev->nDataBytesPerChunk;
} else
while(cfg && cfg->prefix && cfg->dev){
cfg->dev->isMounted = 0;
- cfg->dev->removeObjectCallback = yaffsfs_RemoveObjectCallback;
+ cfg->dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
cfg++;
}
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
- if(parent){
+ if(parent && parent->myDev->readOnly)
+ yaffsfs_SetError(-EINVAL);
+ else if(parent){
obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath);
if(obj)
retVal = 0;
if(!obj) {
yaffsfs_SetError(-ENOENT);
retVal = -1;
+ } else if(obj->myDev->readOnly){
+ yaffsfs_SetError(-EINVAL);
+ retVal= -1;
} else if(target) {
yaffsfs_SetError(-EEXIST);
retVal = -1;
projects / yaffs2.git / blobdiff