/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
/*
* Handle management.
* There are open inodes in yaffsfs_Inode.
- * There are open handles in yaffsfs_Handle.
+ * There are open file descriptors in yaffsfs_FileDes.
+ * There are open handles in yaffsfs_FileDes.
*
* 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.
+ *
+ * We have 3 layers because:
+ * A handle is different than an fd because you can use dup()
+ * to create a new handle that accesses the *same* fd. The two
+ * handles will use the same offset (part of the fd). We only close
+ * down the fd when there are no more handles accessing it.
+ *
+ * More than one fd can currently access one file, but each fd
+ * has its own permsiions and offset.
*/
typedef struct {
u8 shareRead:1;
u8 shareWrite:1;
int inodeId:12; /* Index to corresponding yaffsfs_Inode */
- int useCount:10; /* Use count for this handle */
- u32 position; /* current position in file */
-}yaffsfs_Handle;
+ int handleCount:10; /* Number of handles for this fd */
+ loff_t position; /* current position in file */
+}yaffsfs_FileDes;
+
+typedef struct {
+ short int fdId;
+ short int useCount;
+} yaffsfs_Handle;
static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
+static yaffsfs_FileDes yaffsfs_fd[YAFFSFS_N_HANDLES];
static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
+
static int yaffsfs_handlesInitialised;
-unsigned yaffs_set_trace(unsigned tm)
+unsigned yaffs_set_trace(unsigned tm)
{
yaffs_trace_mask = tm;
return yaffs_trace_mask;
return;
memset(yaffsfs_inode,0,sizeof(yaffsfs_inode));
+ memset(yaffsfs_fd,0,sizeof(yaffsfs_fd));
memset(yaffsfs_handle,0,sizeof(yaffsfs_handle));
+
for(i = 0; i < YAFFSFS_N_HANDLES; i++)
- yaffsfs_handle[i].inodeId = -1;
+ yaffsfs_fd[i].inodeId = -1;
+ for(i = 0; i < YAFFSFS_N_HANDLES; i++)
+ yaffsfs_handle[i].fdId = -1;
}
-yaffsfs_Handle *yaffsfs_GetHandlePointer(int h)
+static yaffsfs_Handle *yaffsfs_HandleToPointer(int h)
{
- if(h < 0 || h >= YAFFSFS_N_HANDLES)
- return NULL;
+ if(h >= 0 && h < YAFFSFS_N_HANDLES)
+ return &yaffsfs_handle[h];
+ return NULL;
+}
+
+static yaffsfs_FileDes *yaffsfs_HandleToFileDes(int handle)
+{
+ yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle);
- return &yaffsfs_handle[h];
+ if(h && h->useCount > 0 && h->fdId >= 0 && h->fdId < YAFFSFS_N_HANDLES)
+ return &yaffsfs_fd[h->fdId];
+
+ return NULL;
}
-yaffsfs_Inode *yaffsfs_GetInodePointer(int handle)
+static yaffsfs_Inode *yaffsfs_HandleToInode(int handle)
{
- yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
+ yaffsfs_FileDes *fd = yaffsfs_HandleToFileDes(handle);
- if(h && h->useCount > 0 && h->inodeId >= 0 && h->inodeId < YAFFSFS_N_HANDLES)
- return &yaffsfs_inode[h->inodeId];
+ if(fd && fd->handleCount > 0 &&
+ fd->inodeId >= 0 && fd->inodeId < YAFFSFS_N_HANDLES)
+ return &yaffsfs_inode[fd->inodeId];
return NULL;
}
-struct yaffs_obj *yaffsfs_GetHandleObject(int handle)
+static struct yaffs_obj *yaffsfs_HandleToObject(int handle)
{
- yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle);
+ yaffsfs_Inode *in = yaffsfs_HandleToInode(handle);
if(in)
return in->iObj;
{
int i;
int ret = -1;
-
+
if(obj)
obj = yaffs_get_equivalent_obj(obj);
int i;
int ret;
yaffsfs_Inode *in = NULL;
-
+
if(obj)
obj = yaffs_get_equivalent_obj(obj);
in->iObj = obj;
in->count++;
}
-
-
+
+
return ret;
}
static void yaffsfs_ReleaseInode(yaffsfs_Inode *in)
{
struct yaffs_obj *obj;
-
+
obj = in->iObj;
if(obj->unlinked)
yaffs_del_obj(obj);
-
+
obj->my_inode = NULL;
in->iObj = NULL;
yaffsfs_ReleaseInode(in);
in->count = 0;
}
- }
+ }
}
-/*
- * yaffsfs_GetHandle
- * Grab a handle (when opening a file)
- */
-static int yaffsfs_GetNewHandle(void)
+static int yaffsfs_NewHandle(yaffsfs_Handle **hptr)
{
int i;
yaffsfs_Handle *h;
for(i = 0; i < YAFFSFS_N_HANDLES; i++){
- h = yaffsfs_GetHandlePointer(i);
- if(!h){
- /* todo bug: should never happen */
- }
+ h = &yaffsfs_handle[i];
if(h->useCount < 1){
memset(h,0,sizeof(yaffsfs_Handle));
- h->inodeId=-1;
+ h->fdId=-1;
h->useCount=1;
+ if(hptr)
+ *hptr = h;
return i;
}
}
return -1;
}
+static int yaffsfs_NewHandleAndFileDes(void)
+{
+ int i;
+ yaffsfs_FileDes *fd;
+ yaffsfs_Handle *h = NULL;
+ int handle = yaffsfs_NewHandle(&h);
+
+ if(handle < 0)
+ return -1;
+
+ for(i = 0; i < YAFFSFS_N_HANDLES; i++){
+ fd = &yaffsfs_fd[i];
+ if(fd->handleCount < 1){
+ memset(fd,0,sizeof(yaffsfs_FileDes));
+ fd->inodeId=-1;
+ fd->handleCount=1;
+ h->fdId = i;
+ return handle;
+ }
+ }
+
+ /* Dump the handle because we could not get a fd */
+ h->useCount = 0;
+ return -1;
+}
+
/*
* yaffs_get_handle
* Increase use of handle when reading/writing a file
+ * Also gets the file descriptor.
*/
+
static int yaffsfs_GetHandle(int handle)
{
- yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
+ yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle);
- if(h && h->useCount > 0){
+ if(h && h->useCount > 0){
h->useCount++;
+ return 0;
}
- return 0;
+ return -1;
}
/*
* Let go of a handle when closing a file or aborting an open or
* ending a read or write.
*/
+
+static int yaffsfs_PutFileDes(int fdId)
+{
+ yaffsfs_FileDes *fd;
+
+ if(fdId >= 0 && fdId < YAFFSFS_N_HANDLES){
+ fd = &yaffsfs_fd[fdId];
+ fd->handleCount--;
+ if(fd->handleCount < 1){
+ if(fd->inodeId >= 0){
+ yaffsfs_PutInode(fd->inodeId);
+ fd->inodeId = -1;
+ }
+ }
+ }
+ return 0;
+}
static int yaffsfs_PutHandle(int handle)
{
- yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
+ yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle);
- if(h && h->useCount > 0){
+ if(h && h->useCount > 0){
h->useCount--;
if(h->useCount < 1){
- if(h->inodeId >= 0){
- yaffsfs_PutInode(h->inodeId);
- h->inodeId = -1;
- }
+ yaffsfs_PutFileDes(h->fdId);
+ h->fdId = -1;
}
}
+
return 0;
}
static void yaffsfs_BreakDeviceHandles(struct yaffs_dev *dev)
{
+ yaffsfs_FileDes *fd;
yaffsfs_Handle *h;
struct yaffs_obj *obj;
int i;
for(i = 0; i < YAFFSFS_N_HANDLES; i++){
- h = yaffsfs_GetHandlePointer(i);
- obj = yaffsfs_GetHandleObject(i);
- if(h && h->useCount>0 && obj && obj->my_dev == dev){
+ h = yaffsfs_HandleToPointer(i);
+ fd = yaffsfs_HandleToFileDes(i);
+ obj = yaffsfs_HandleToObject(i);
+ if(h && h->useCount > 0){
h->useCount = 0;
- yaffsfs_PutInode(h->inodeId);
- h->inodeId = -1;
+ h->fdId = 0;
+ }
+ if(fd && fd->handleCount>0 && obj && obj->my_dev == dev){
+
+ fd->handleCount = 0;
+ yaffsfs_PutInode(fd->inodeId);
+ fd->inodeId = -1;
}
}
}
/*
* Stuff to handle names.
*/
+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
+
+static int yaffs_toupper(YCHAR a)
+{
+ if(a >= 'a' && a <= 'z')
+ return (a - 'a') + 'A';
+ else
+ return a;
+}
-
+int yaffsfs_Match(YCHAR a, YCHAR b)
+{
+ return (yaffs_toupper(a) == yaffs_toupper(b));
+}
+#else
int yaffsfs_Match(YCHAR a, YCHAR b)
{
/* case sensitive */
return (a == b);
}
+#endif
int yaffsfs_IsPathDivider(YCHAR ch)
{
int yaffsfs_CheckNameLength(const char *name)
{
- int retVal = 0;
+ int retVal = 0;
int nameLength = yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH+1);
-
+
if(nameLength == 0){
yaffsfs_SetError(-ENOENT);
retVal = -1;
retVal = -1;
}
- return retVal;
+ return retVal;
}
* We will use 3 * max name length instead.
*/
*ret_path = NULL;
- path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
+ path_length = yaffs_strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
/* If the last character is a path divider, then we need to
* trim it back so that the name look-up works properly.
* Curveball: Need to handle multiple path dividers:
* eg. /foof/sdfse///// -> /foo/sdfse
*/
- if(path_length > 0 &&
+ if(path_length > 0 &&
yaffsfs_IsPathDivider(path[path_length-1])){
- alt_path = YMALLOC(path_length + 1);
+ alt_path = kmalloc(path_length + 1, 0);
if(!alt_path)
return -1;
- strcpy(alt_path, path);
+ yaffs_strcpy(alt_path, path);
for(i = path_length-1;
i >= 0 && yaffsfs_IsPathDivider(alt_path[i]);
i--)
n++;
path++;
}
-
+
return (*path) ? -1 : 0;
}
/* got to the end of the string */
return dir;
else{
- if(yaffs_strcmp(str,_Y(".")) == 0)
- {
+ if(yaffs_strcmp(str,_Y(".")) == 0){
/* Do nothing */
- }
- else if(yaffs_strcmp(str,_Y("..")) == 0)
+ } else if(yaffs_strcmp(str,_Y("..")) == 0) {
dir = dir->parent;
- else{
+ } else{
dir = yaffs_find_by_name(dir,str);
dir = yaffsfs_FollowLink(dir,symDepth,loop);
- if(dir && dir->variant_type !=
+ if(dir && dir->variant_type !=
YAFFS_OBJECT_TYPE_DIRECTORY){
if(notDir)
*notDir = 1;
dir = NULL;
}
-
+
}
}
}
/*************************************************************************
- * Start of yaffsfs visible functions.
+ * Start of yaffsfs visible functions.
*************************************************************************/
-int yaffs_dup(int fd)
+int yaffs_dup(int handle)
{
- int newHandle = -1;
- yaffsfs_Handle *oldPtr = NULL;
- yaffsfs_Handle *newPtr = NULL;
+ int newHandleNumber = -1;
+ yaffsfs_FileDes *existingFD = NULL;
+ yaffsfs_Handle *existingHandle = NULL;
+ yaffsfs_Handle *newHandle = NULL;
yaffsfs_Lock();
-
- oldPtr = yaffsfs_GetHandlePointer(fd);
- if(oldPtr && oldPtr->useCount > 0)
- newHandle = yaffsfs_GetNewHandle();
- if(newHandle >= 0)
- newPtr = yaffsfs_GetHandlePointer(newHandle);
-
- if(newPtr)
- *newPtr = *oldPtr;
+ existingHandle = yaffsfs_HandleToPointer(handle);
+ existingFD = yaffsfs_HandleToFileDes(handle);
+ if(existingFD)
+ newHandleNumber = yaffsfs_NewHandle(&newHandle);
+ if(newHandle){
+ newHandle->fdId = existingHandle->fdId;
+ existingFD->handleCount++;
+ }
yaffsfs_Unlock();
- if(!oldPtr)
+ if(!existingFD)
yaffsfs_SetError(-EBADF);
- else if (!newPtr)
+ else if (!newHandle)
yaffsfs_SetError(-ENOMEM);
- return newHandle;
+ return newHandleNumber;
}
+static int yaffsfs_TooManyObjects(struct yaffs_dev *dev)
+{
+ int current_objects = dev->n_obj - dev->n_deleted_files;
+ if(dev->param.max_objects && current_objects > dev->param.max_objects)
+ return 1;
+ else
+ return 0;
+}
int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
{
struct yaffs_obj *dir = NULL;
YCHAR *name;
int handle = -1;
- yaffsfs_Handle *yh = NULL;
+ yaffsfs_FileDes *fd = NULL;
int openDenied = 0;
int symDepth = 0;
int errorReported = 0;
yaffsfs_Lock();
- handle = yaffsfs_GetNewHandle();
+ handle = yaffsfs_NewHandleAndFileDes();
if(handle < 0){
yaffsfs_SetError(-ENFILE);
errorReported = 1;
} else {
- yh = yaffsfs_GetHandlePointer(handle);
+ fd = yaffsfs_HandleToFileDes(handle);
/* try to find the exisiting object */
obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL);
if( writeRequested && !(obj->yst_mode & S_IWRITE))
openDenied = 1;
- if( !errorReported && writeRequested &&
+ if( !errorReported && writeRequested &&
obj->my_dev->read_only){
openDenied = 1;
yaffsfs_SetError(-EROFS);
/* Check sharing of an existing object. */
if(!openDenied){
- yaffsfs_Handle *hx;
+ yaffsfs_FileDes *fdx;
int i;
+
sharedReadAllowed = 1;
sharedWriteAllowed = 1;
alreadyReading = 0;
alreadyWriting = 0;
for( i = 0; i < YAFFSFS_N_HANDLES; i++){
- hx = &yaffsfs_handle[i];
- if(hx->useCount > 0 &&
- hx->inodeId >= 0 &&
- yaffsfs_inode[hx->inodeId].iObj == obj){
- if(!hx->shareRead)
+ fdx = &yaffsfs_fd[i];
+ if(fdx->handleCount > 0 &&
+ fdx->inodeId >= 0 &&
+ yaffsfs_inode[fdx->inodeId].iObj == obj){
+ if(!fdx->shareRead)
sharedReadAllowed = 0;
- if(!hx->shareWrite)
+ if(!fdx->shareWrite)
sharedWriteAllowed = 0;
- if(hx->reading)
+ if(fdx->reading)
alreadyReading = 1;
- if(hx->writing)
+ if(fdx->writing)
alreadyWriting = 1;
}
}
- if((!sharedReadAllowed && readRequested)||
+ if((!sharedReadAllowed && readRequested)||
(!shareRead && alreadyReading) ||
(!sharedWriteAllowed && writeRequested) ||
(!shareWrite && alreadyWriting)){
if(dir->my_dev->read_only){
yaffsfs_SetError(-EROFS);
errorReported = 1;
+ } else if(yaffsfs_TooManyObjects(dir->my_dev)) {
+ yaffsfs_SetError(-ENFILE);
+ errorReported = 1;
} else
obj = yaffs_create_file(dir,name,mode,0,0);
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.
+ * can't happen if the number of inode items >= number of handles.
*/
}
-
- yh->inodeId = inodeId;
- yh->reading = readRequested;
- yh->writing = writeRequested;
- yh->append = (oflag & O_APPEND) ? 1 : 0;
- yh->position = 0;
- yh->shareRead = shareRead;
- yh->shareWrite = shareWrite;
+
+ fd->inodeId = inodeId;
+ fd->reading = readRequested;
+ fd->writing = writeRequested;
+ fd->append = (oflag & O_APPEND) ? 1 : 0;
+ fd->position = 0;
+ fd->shareRead = shareRead;
+ fd->shareWrite = shareWrite;
/* Hook inode to object */
obj->my_inode = (void*) &yaffsfs_inode[inodeId];
- if((oflag & O_TRUNC) && yh->writing)
+ if((oflag & O_TRUNC) && fd->writing)
yaffs_resize_file(obj,0);
} else {
yaffsfs_PutHandle(handle);
- if(!errorReported)
+ if(!errorReported)
yaffsfs_SetError(0); /* Problem */
handle = -1;
}
int yaffs_open(const YCHAR *path, int oflag, int mode)
{
- return yaffs_open_sharing(path, oflag, mode, YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
+ return yaffs_open_sharing(path, oflag, mode,
+ YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
}
-int yaffs_Dofsync(int fd,int datasync)
+int yaffs_Dofsync(int handle,int datasync)
{
- yaffsfs_Handle *h = NULL;
int retVal = -1;
+ struct yaffs_obj *obj;
yaffsfs_Lock();
- h = yaffsfs_GetHandlePointer(fd);
+ obj = yaffsfs_HandleToObject(handle);
- if(!h || h->useCount < 1)
+ if(!obj)
yaffsfs_SetError(-EBADF);
+ else if(obj->my_dev->read_only)
+ yaffsfs_SetError(-EROFS);
else {
- struct yaffs_obj * obj;
- obj = yaffsfs_inode[h->inodeId].iObj;
- if(obj->my_dev->read_only)
- yaffsfs_SetError(-EROFS);
- else {
- yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync);
- retVal = 0;
- }
+ yaffs_flush_file(obj,1,datasync);
+ retVal = 0;
}
yaffsfs_Unlock();
return retVal;
}
-int yaffs_fsync(int fd)
+int yaffs_fsync(int handle)
{
- return yaffs_Dofsync(fd,0);
+ return yaffs_Dofsync(handle,0);
}
-int yaffs_flush(int fd)
+int yaffs_flush(int handle)
{
- return yaffs_fsync(fd);
+ return yaffs_fsync(handle);
}
-int yaffs_fdatasync(int fd)
+int yaffs_fdatasync(int handle)
{
- return yaffs_Dofsync(fd,1);
+ return yaffs_Dofsync(handle,1);
}
-int yaffs_close(int fd)
+int yaffs_close(int handle)
{
yaffsfs_Handle *h = NULL;
- int retVal = 0;
+ struct yaffs_obj *obj = NULL;
+ int retVal = -1;
yaffsfs_Lock();
- h = yaffsfs_GetHandlePointer(fd);
+ h = yaffsfs_HandleToPointer(handle);
+ obj = yaffsfs_HandleToObject(handle);
- if(h && h->useCount > 0) {
+ if(!h || !obj)
+ yaffsfs_SetError(-EBADF);
+ else {
/* clean up */
- yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,0);
- yaffsfs_PutHandle(fd);
+ yaffs_flush_file(obj,1,0);
+ yaffsfs_PutHandle(handle);
retVal = 0;
- } else {
- /* bad handle */
- yaffsfs_SetError(-EBADF);
- retVal = -1;
}
yaffsfs_Unlock();
-int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset)
+int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte, int isPread, loff_t offset)
{
- yaffsfs_Handle *h = NULL;
+ yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
- int pos = 0;
- int startPos = 0;
- int endPos = 0;
+ loff_t pos = 0;
+ loff_t startPos = 0;
+ loff_t endPos = 0;
int nRead = 0;
int nToRead = 0;
int totalRead = 0;
- unsigned int maxRead;
+ loff_t maxRead;
u8 *buf = (u8 *)vbuf;
if(!vbuf){
}
yaffsfs_Lock();
- h = yaffsfs_GetHandlePointer(fd);
- obj = yaffsfs_GetHandleObject(fd);
+ fd = yaffsfs_HandleToFileDes(handle);
+ obj = yaffsfs_HandleToObject(handle);
- if(!h || !obj){
+ if(!fd || !obj){
/* bad handle */
yaffsfs_SetError(-EBADF);
totalRead = -1;
- } else if(!h->reading){
+ } else if(!fd->reading){
/* Not a reading handle */
yaffsfs_SetError(-EINVAL);
totalRead = -1;
if(isPread)
startPos = offset;
else
- startPos = h->position;
+ startPos = fd->position;
pos = startPos;
-
+
if(yaffs_get_obj_length(obj) > pos)
maxRead = yaffs_get_obj_length(obj) - pos;
else
nbyte = maxRead;
- yaffsfs_GetHandle(fd);
+ yaffsfs_GetHandle(handle);
endPos = pos + nbyte;
if(nToRead > nbyte)
nToRead = nbyte;
- /* Tricky bit...
+ /* Tricky bit...
* Need to reverify object in case the device was
* unmounted in another thread.
*/
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(handle);
if(!obj)
nRead = 0;
else
nbyte-=nRead;
else
nbyte = 0; /* no more to read */
-
-
+
+
if(nbyte > 0){
yaffsfs_Unlock();
yaffsfs_Lock();
}
- yaffsfs_PutHandle(fd);
+ yaffsfs_PutHandle(handle);
if(!isPread) {
if(totalRead >= 0)
- h->position = startPos + totalRead;
+ fd->position = startPos + totalRead;
else
yaffsfs_SetError(-EINVAL);
}
}
-int yaffs_read(int fd, void *buf, unsigned int nbyte)
+int yaffs_read(int handle, void *buf, unsigned int nbyte)
{
- return yaffsfs_do_read(fd, buf, nbyte, 0, 0);
+ return yaffsfs_do_read(handle, buf, nbyte, 0, 0);
}
-int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
+int yaffs_pread(int handle, void *buf, unsigned int nbyte, loff_t offset)
{
- return yaffsfs_do_read(fd, buf, nbyte, 1, offset);
+ return yaffsfs_do_read(handle, buf, nbyte, 1, offset);
}
-int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset)
+int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte, int isPwrite, loff_t offset)
{
- yaffsfs_Handle *h = NULL;
+ yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
- int pos = 0;
- int startPos = 0;
- int endPos;
+ loff_t pos = 0;
+ loff_t startPos = 0;
+ loff_t endPos;
int nWritten = 0;
int totalWritten = 0;
int write_trhrough = 0;
}
yaffsfs_Lock();
- h = yaffsfs_GetHandlePointer(fd);
- obj = yaffsfs_GetHandleObject(fd);
+ fd = yaffsfs_HandleToFileDes(handle);
+ obj = yaffsfs_HandleToObject(handle);
- if(!h || !obj){
+ if(!fd || !obj){
/* bad handle */
yaffsfs_SetError(-EBADF);
totalWritten = -1;
- } else if(!h->writing){
+ } else if(!fd->writing){
yaffsfs_SetError(-EINVAL);
totalWritten=-1;
} else if(obj->my_dev->read_only){
yaffsfs_SetError(-EROFS);
totalWritten=-1;
} else {
- if(h->append)
+ if(fd->append)
startPos = yaffs_get_obj_length(obj);
else if(isPwrite)
startPos = offset;
else
- startPos = h->position;
+ startPos = fd->position;
- yaffsfs_GetHandle(fd);
+ yaffsfs_GetHandle(handle);
pos = startPos;
endPos = pos + nbyte;
if(nToWrite > nbyte)
nToWrite = nbyte;
- /* Tricky bit...
+ /* Tricky bit...
* Need to reverify object in case the device was
* remounted or unmounted in another thread.
*/
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(handle);
if(!obj || obj->my_dev->read_only)
nWritten = 0;
else
}
}
- yaffsfs_PutHandle(fd);
+ yaffsfs_PutHandle(handle);
if(!isPwrite){
if(totalWritten > 0)
- h->position = startPos + totalWritten;
+ fd->position = startPos + totalWritten;
else
yaffsfs_SetError(-EINVAL);
}
return yaffsfs_do_write(fd, buf, nbyte, 0, 0);
}
-int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offset)
+int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, loff_t offset)
{
return yaffsfs_do_write(fd, buf, nbyte, 1, offset);
}
-int yaffs_truncate(const YCHAR *path,off_t new_size)
+int yaffs_truncate(const YCHAR *path,loff_t new_size)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
else if(new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE)
yaffsfs_SetError(-EINVAL);
else
- result = yaffs_resize_file(obj,new_size);
+ result = yaffs_resize_file(obj, new_size);
yaffsfs_Unlock();
return (result) ? 0 : -1;
}
-int yaffs_ftruncate(int fd, off_t new_size)
+int yaffs_ftruncate(int handle, loff_t new_size)
{
- yaffsfs_Handle *h = NULL;
+ yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
int result = 0;
yaffsfs_Lock();
- h = yaffsfs_GetHandlePointer(fd);
- obj = yaffsfs_GetHandleObject(fd);
+ fd = yaffsfs_HandleToFileDes(handle);
+ obj = yaffsfs_HandleToObject(handle);
- if(!h || !obj)
+ if(!fd || !obj)
/* bad handle */
yaffsfs_SetError(-EBADF);
- else if(!h->writing)
+ else if(!fd->writing)
yaffsfs_SetError(-EINVAL);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EROFS);
yaffsfs_SetError(-EINVAL);
else
/* resize the file */
- result = yaffs_resize_file(obj,new_size);
+ result = yaffs_resize_file(obj, new_size);
yaffsfs_Unlock();
return (result) ? 0 : -1;
}
-off_t yaffs_lseek(int fd, off_t offset, int whence)
+loff_t yaffs_lseek(int handle, loff_t offset, int whence)
{
- yaffsfs_Handle *h = NULL;
+ yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
- int pos = -1;
- int fSize = -1;
+ loff_t pos = -1;
+ loff_t fSize = -1;
yaffsfs_Lock();
- h = yaffsfs_GetHandlePointer(fd);
- obj = yaffsfs_GetHandleObject(fd);
+ fd = yaffsfs_HandleToFileDes(handle);
+ obj = yaffsfs_HandleToObject(handle);
- if(!h || !obj)
+ if(!fd || !obj)
yaffsfs_SetError(-EBADF);
else if(offset > YAFFS_MAX_FILE_SIZE)
yaffsfs_SetError(-EINVAL);
if(offset >= 0)
pos = offset;
} else if(whence == SEEK_CUR) {
- if( (h->position + offset) >= 0)
- pos = (h->position + offset);
+ if( (fd->position + offset) >= 0)
+ pos = (fd->position + offset);
} else if(whence == SEEK_END) {
fSize = yaffs_get_obj_length(obj);
if(fSize >= 0 && (fSize + offset) >= 0)
pos = fSize + offset;
- }
+ }
if(pos >= 0 && pos <= YAFFS_MAX_FILE_SIZE)
- h->position = pos;
+ fd->position = pos;
else{
yaffsfs_SetError(-EINVAL);
pos = -1;
return -1;
}
- if(yaffsfs_CheckPath(newPath) < 0){
+ if(yaffsfs_CheckPath(oldPath) < 0 ||
+ yaffsfs_CheckPath(newPath) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
}
obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL,NULL,NULL);
newobj = yaffsfs_FindObject(NULL,newPath,0,0,NULL,NULL,NULL);
- /* If the object being renamed is a directory and the
+ /* If the object being renamed is a directory and the
* path ended with a "/" then the olddir == obj.
* We pass through NULL for the old name to tell the lower layers
* to use olddir as the object.
/*
* 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,
+ * Do this by tracing from the new directory back to the root,
* checking for obj
*/
yaffsfs_Unlock();
if(alt_newpath)
- YFREE(alt_newpath);
+ kfree(alt_newpath);
return (result == YAFFS_FAIL) ? -1 : 0;
}
}
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
if(obj)
retVal = yaffsfs_DoStat(obj,buf);
return retVal;
}
+static int yaffsfs_DoUtime(struct yaffs_obj *obj,const struct yaffs_utimbuf *buf)
+{
+ int retVal = -1;
+ int result;
+
+ struct yaffs_utimbuf local;
+
+ obj = yaffs_get_equivalent_obj(obj);
+
+ if(obj && obj->my_dev->read_only) {
+ yaffsfs_SetError(-EROFS);
+ return -1;
+ }
+
+
+ if(!buf){
+ local.actime = Y_CURRENT_TIME;
+ local.modtime = local.actime;
+ buf = &local;
+ }
+
+ if(obj){
+ obj->yst_atime = buf->actime;
+ obj->yst_mtime = buf->modtime;
+ obj->dirty = 1;
+ result = yaffs_flush_file(obj,0,0);
+ retVal = result == YAFFS_OK ? 0 : -1;
+ }
+
+ return retVal;
+}
+
+int yaffs_utime(const YCHAR *path, const struct yaffs_utimbuf *buf)
+{
+ struct yaffs_obj *obj=NULL;
+ struct yaffs_obj *dir=NULL;
+ int retVal = -1;
+ int notDir = 0;
+ int loop = 0;
+
+ if(!path){
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
+
+ if(yaffsfs_CheckPath(path) < 0){
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
+
+ yaffsfs_Lock();
+
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop);
+
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(loop)
+ yaffsfs_SetError(-ELOOP);
+ else if(!dir || !obj)
+ yaffsfs_SetError(-ENOENT);
+ else
+ retVal = yaffsfs_DoUtime(obj,buf);
+
+ yaffsfs_Unlock();
+
+ return retVal;
+
+}
+int yaffs_futime(int fd, const struct yaffs_utimbuf *buf)
+{
+ struct yaffs_obj *obj;
+
+ int retVal = -1;
+
+ yaffsfs_Lock();
+ obj = yaffsfs_HandleToObject(fd);
+
+ if(obj)
+ retVal = yaffsfs_DoUtime(obj,buf);
+ else
+ /* bad handle */
+ yaffsfs_SetError(-EBADF);
+
+ yaffsfs_Unlock();
+
+ return retVal;
+}
+
+
#ifndef CONFIG_YAFFS_WINCE
/* xattrib functions */
if(follow)
obj = yaffsfs_FollowLink(obj,0,&loop);
- if(!dir && notDir)
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
- else if(loop)
+ else if(loop)
yaffsfs_SetError(-ELOOP);
- else if(!dir || !obj)
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_set_xattrib(obj,name,data,size,flags);
}
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
- if(!obj)
+ if(!obj)
yaffsfs_SetError(-EBADF);
else {
retVal = yaffs_set_xattrib(obj,name,data,size,flags);
if(follow)
obj = yaffsfs_FollowLink(obj,0,&loop);
- if(!dir && notDir)
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
- else if(loop)
+ else if(loop)
yaffsfs_SetError(-ELOOP);
- else if(!dir || !obj)
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_get_xattrib(obj,name,data,size);
}
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
if(obj) {
retVal = yaffs_get_xattrib(obj,name,data,size);
if(follow)
obj = yaffsfs_FollowLink(obj,0,&loop);
- if(!dir && notDir)
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
- else if(loop)
+ else if(loop)
yaffsfs_SetError(-ELOOP);
- else if(!dir || !obj)
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_list_xattrib(obj, data,size);
}
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
if(obj) {
retVal = yaffs_list_xattrib(obj,data,size);
if(follow)
obj = yaffsfs_FollowLink(obj,0,&loop);
- if(!dir && notDir)
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
- else if(loop)
+ else if(loop)
yaffsfs_SetError(-ELOOP);
- else if(!dir || !obj)
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_remove_xattrib(obj,name);
}
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
if(obj){
retVal = yaffs_remove_xattrib(obj,name);
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
if(obj){
retVal = 0;
} else
/* bad handle */
- yaffsfs_SetError(-EBADF);
-
+ yaffsfs_SetError(-EBADF);
+
yaffsfs_Unlock();
-
+
return retVal;
}
-int yaffs_set_wince_times(int fd,
- const unsigned *wctime,
- const unsigned *watime,
+int yaffs_set_wince_times(int fd,
+ const unsigned *wctime,
+ const unsigned *watime,
const unsigned *wmtime)
{
struct yaffs_obj *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
if(obj){
obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop);
obj = yaffsfs_FollowLink(obj,0,&loop);
- if(!dir && notDir)
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
- else if(loop)
+ else if(loop)
yaffsfs_SetError(-ELOOP);
- else if(!dir || !obj)
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else if((amode & W_OK) && obj->my_dev->read_only)
yaffsfs_SetError(-EROFS);
obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir,&loop);
obj = yaffsfs_FollowLink(obj,0,&loop);
- if(!dir && notDir)
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
- else if(loop)
+ else if(loop)
yaffsfs_SetError(-ELOOP);
- else if(!dir || !obj)
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EROFS);
}
yaffsfs_Lock();
- obj = yaffsfs_GetHandleObject(fd);
+ obj = yaffsfs_HandleToObject(fd);
if(!obj)
yaffsfs_SetError(-EBADF);
}
if(alt_path)
path = alt_path;
-
+
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop);
if(!parent && notDir)
yaffsfs_SetError(-ELOOP);
else if(!parent)
yaffsfs_SetError(-ENOENT);
+ else if(yaffsfs_TooManyObjects(parent->my_dev))
+ yaffsfs_SetError(-ENFILE);
else if(yaffs_strnlen(name,5) == 0){
/* Trying to make the root itself */
yaffsfs_SetError(-EEXIST);
yaffsfs_Unlock();
if(alt_path)
- YFREE(alt_path);
+ kfree(alt_path);
return retVal;
}
path = alt_path;
result = yaffsfs_DoUnlink(path,1);
if(alt_path)
- YFREE(alt_path);
+ kfree(alt_path);
return result;
}
return (void *)dev;
}
-int yaffs_mount2(const YCHAR *path,int read_only)
+int yaffs_mount_common(const YCHAR *path,int read_only, int skip_checkpt)
{
int retVal=-1;
int result=YAFFS_FAIL;
return -1;
}
- T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+ yaffs_trace(YAFFS_TRACE_MOUNT,"yaffs: Mounting %s",path);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(dev){
if(!dev->is_mounted){
dev->read_only = read_only ? 1 : 0;
- result = yaffs_guts_initialise(dev);
+ if(skip_checkpt) {
+ u8 skip = dev->param.skip_checkpt_rd;
+ dev->param.skip_checkpt_rd = 1;
+ result = yaffs_guts_initialise(dev);
+ dev->param.skip_checkpt_rd = skip;
+ } else {
+ result = yaffs_guts_initialise(dev);
+ }
+
if(result == YAFFS_FAIL)
yaffsfs_SetError(-ENOMEM);
retVal = result ? 0 : -1;
}
+int yaffs_mount2(const YCHAR *path, int readonly)
+{
+ return yaffs_mount_common(path, readonly, 0);
+}
int yaffs_mount(const YCHAR *path)
{
- return yaffs_mount2(path,0);
+ return yaffs_mount_common(path, 0, 0);
}
int yaffs_sync(const YCHAR *path)
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
}
-
+
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
else if(dev->read_only)
yaffsfs_SetError(-EROFS);
else {
-
+
yaffs_flush_whole_cache(dev);
yaffs_checkpoint_save(dev);
retVal = 0;
-
- }
+
+ }
}else
yaffsfs_SetError(-ENODEV);
yaffsfs_Unlock();
- return retVal;
+ return retVal;
+}
+
+
+static int yaffsfs_IsDevBusy(struct yaffs_dev * dev)
+{
+ int i;
+ struct yaffs_obj *obj;
+
+ for(i = 0; i < YAFFSFS_N_HANDLES; i++){
+ obj = yaffsfs_HandleToObject(i);
+ if(obj && obj->my_dev == dev)
+ return 1;
+ }
+ return 0;
}
{
int retVal=-1;
struct yaffs_dev *dev=NULL;
- yaffsfs_Handle *yh;
if(!path){
yaffsfs_SetError(-EFAULT);
dev = yaffsfs_FindMountPoint(path);
if(dev){
if(dev->is_mounted){
- int i;
- int inUse;
-
yaffs_flush_whole_cache(dev);
- for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){
- 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 */
- }
-
- if(!inUse || force){
+ if(force || ! yaffsfs_IsDevBusy(dev)){
if(read_only)
yaffs_checkpoint_save(dev);
dev->read_only = read_only ? 1 : 0;
dev = yaffsfs_FindMountPoint(path);
if(dev){
if(dev->is_mounted){
- int i;
int inUse;
-
yaffs_flush_whole_cache(dev);
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)
- inUse = 1; /* the device is in use, can't unmount */
- }
-
+ inUse = yaffsfs_IsDevBusy(dev);
if(!inUse || force){
if(inUse)
yaffsfs_BreakDeviceHandles(dev);
struct yaffs_dev *dev=NULL;
YCHAR *dummy;
+ if(!path){
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
+
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev && dev->is_mounted){
- retVal = (dev->param.end_block - dev->param.start_block + 1) -
+ retVal = (dev->param.end_block - dev->param.start_block + 1) -
dev->param.n_reserved_blocks;
retVal *= dev->param.chunks_per_block;
retVal *= dev->data_bytes_per_chunk;
if(n_obj > dev->n_hardlinks)
retVal = n_obj - dev->n_hardlinks;
}
-
+
if(retVal < 0)
yaffsfs_SetError(-EINVAL);
-
+
yaffsfs_Unlock();
- return retVal;
+ return retVal;
}
void yaffs_add_device(struct yaffs_dev *dev)
{
+ struct list_head *cfg;
+ /* First check that the device is not in the list. */
+
+ list_for_each(cfg, &yaffsfs_deviceList){
+ if(dev == list_entry(cfg, struct yaffs_dev, dev_list))
+ return;
+ }
+
dev->is_mounted = 0;
dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback;
struct yaffs_obj *dirObj; /* ptr to directory being searched */
struct yaffs_obj *nextReturn; /* obj to be returned by next readddir */
int offset;
- struct list_head others;
+ struct list_head others;
} yaffsfs_DirectorySearchContext;
yaffsfs_SetError(-ENOTDIR);
else {
- dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
+ dsc = kmalloc(sizeof(yaffsfs_DirectorySearchContext), 0);
dir = (yaffs_DIR *)dsc;
if(dsc){
if(!search_contexts.next)
INIT_LIST_HEAD(&search_contexts);
- list_add(&dsc->others,&search_contexts);
+ list_add(&dsc->others,&search_contexts);
yaffsfs_SetDirRewound(dsc);
}
yaffsfs_Lock();
dsc->magic = 0;
list_del(&dsc->others); /* unhook from list */
- YFREE(dsc);
+ kfree(dsc);
yaffsfs_Unlock();
return 0;
}
return -1;
}
- if(yaffsfs_CheckPath(newpath) < 0){
+ if(yaffsfs_CheckPath(newpath) < 0 ||
+ yaffsfs_CheckPath(oldpath) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
}
+
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,newpath,&name,0,¬Dir,&loop);
if(!parent && notDir)
yaffsfs_SetError(-ELOOP);
else if( !parent || yaffs_strnlen(name,5) < 1)
yaffsfs_SetError(-ENOENT);
+ else if(yaffsfs_TooManyObjects(parent->my_dev))
+ yaffsfs_SetError(-ENFILE);
else if(parent->my_dev->read_only)
yaffsfs_SetError(-EROFS);
else if(parent){
obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop);
- if(!dir && notDir)
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
- else if(loop)
+ else if(loop)
yaffsfs_SetError(-ELOOP);
- else if(!dir || !obj)
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK)
yaffsfs_SetError(-EINVAL);
return -1;
}
- if(yaffsfs_CheckPath(linkpath) < 0){
+ if(yaffsfs_CheckPath(linkpath) < 0 ||
+ yaffsfs_CheckPath(oldpath) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
}
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EROFS);
+ else if(yaffsfs_TooManyObjects(obj->my_dev))
+ yaffsfs_SetError(-ENFILE);
else if(lnk)
yaffsfs_SetError(-EEXIST);
else if(lnk_dir->my_dev != obj->my_dev)
yaffsfs_SetError(-EXDEV);
- else {
+ else {
retVal = yaffsfs_CheckNameLength(newname);
-
+
if(retVal == 0) {
lnk = yaffs_link_obj(lnk_dir,newname,obj);
if(lnk)
/*
* D E B U G F U N C T I O N S
*/
-
+
/*
* yaffs_n_handles()
* Returns number of handles attached to the object
projects / yaffs2.git / blobdiff