#define NULL ((void *)0)
#endif
+#define ROOT_DIR(dev) (((dev) && (dev)->is_mounted) ? (dev)->root_dir : NULL)
+
/* YAFFSFS_RW_SIZE must be a power of 2 */
#define YAFFSFS_RW_SHIFT (13)
#define YAFFSFS_RW_SIZE (1<<YAFFSFS_RW_SHIFT)
int *notDir, int *loop);
static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
-static yaffs_DIR *yaffsfs_opendir_no_lock(const YCHAR *dirname);
+static yaffs_DIR *yaffsfs_opendir_reldir_no_lock(
+ struct yaffs_obj *reldir, const YCHAR *dirname);
static int yaffsfs_closedir_no_lock(yaffs_DIR *dirent);
unsigned int yaffs_wr_attempts;
static void yaffsfs_InitHandles(void)
{
int i;
+
if (yaffsfs_handlesInitialised)
return;
YCHAR *alias = obj->variant.symlink_variant.alias;
if (yaffsfs_IsPathDivider(*alias))
- /* Starts with a /, need to scan from root up */
+ /*
+ * Starts with a /, need to scan from root up */
+ /* NB Might not work if this is called with root != NULL
+ */
obj = yaffsfs_FindObject(NULL, alias, symDepth++,
1, NULL, NULL, loop);
else
return 0;
}
-int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
+int yaffs_open_sharing_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ int oflag, int mode, int sharing)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
fd = yaffsfs_HandleToFileDes(handle);
/* try to find the exisiting object */
- obj = yaffsfs_FindObject(NULL, path, 0, 1, NULL, NULL, NULL);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, NULL, NULL, NULL);
obj = yaffsfs_FollowLink(obj, symDepth++, &loop);
}
if(is_dir) {
- dsc = yaffsfs_opendir_no_lock(path);
+ dsc = yaffsfs_opendir_reldir_no_lock(reldir, path);
if (!dsc) {
openDenied = 1;
yaffsfs_SetError(-ENFILE);
* the directory exists. If not, error.
*/
if (!obj && !errorReported) {
- dir = yaffsfs_FindDirectory(NULL, path, &name, 0,
+ dir = yaffsfs_FindDirectory(reldir, path, &name, 0,
¬Dir, &loop);
if (!dir && notDir) {
yaffsfs_SetError(-ENOTDIR);
return handle;
}
-int yaffs_open(const YCHAR *path, int oflag, int mode)
+int yaffs_open_sharing_reldev(struct yaffs_dev *dev, const YCHAR *path, int oflag,
+ int mode, int sharing)
+{
+ return yaffs_open_sharing_reldir(ROOT_DIR(dev), path,
+ oflag, mode, sharing);
+}
+
+int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
+{
+ return yaffs_open_sharing_reldir(NULL, path, oflag, mode, sharing);
+}
+
+int yaffs_open_reldir(struct yaffs_obj *reldir,const YCHAR *path, int oflag, int mode)
+{
+ return yaffs_open_sharing_reldir(reldir, path, oflag, mode,
+ YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
+}
+
+int yaffs_open_reldev(struct yaffs_dev *dev,const YCHAR *path, int oflag, int mode)
{
- return yaffs_open_sharing(path, oflag, mode,
+ return yaffs_open_sharing_reldir(ROOT_DIR(dev), path, oflag, mode,
YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
}
+int yaffs_open(const YCHAR *path, int oflag, int mode)
+{
+ return yaffs_open_reldir(NULL, path, oflag, mode);
+}
+
static int yaffs_Dofsync(int handle, int datasync)
{
int retVal = -1;
return yaffsfs_do_write(fd, buf, nbyte, 1, offset);
}
-int yaffs_truncate(const YCHAR *path, Y_LOFF_T new_size)
+int yaffs_truncate_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ Y_LOFF_T new_size)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
obj = yaffsfs_FollowLink(obj, 0, &loop);
if (!dir && notDir)
return (result) ? 0 : -1;
}
+int yaffs_truncate_reldev(struct yaffs_dev *dev, const YCHAR *path,
+ Y_LOFF_T new_size)
+{
+ return yaffs_truncate_reldir(ROOT_DIR(dev), path, new_size);
+}
+
+int yaffs_truncate(const YCHAR *path, Y_LOFF_T new_size)
+{
+ return yaffs_truncate_reldir(NULL, path, new_size);
+}
+
int yaffs_ftruncate(int handle, Y_LOFF_T new_size)
{
struct yaffsfs_FileDes *fd = NULL;
return pos;
}
-static int yaffsfs_DoUnlink(const YCHAR *path, int isDirectory)
+static int yaffsfs_DoUnlink_reldir(struct yaffs_obj *reldir,
+ const YCHAR *path, int isDirectory)
{
struct yaffs_obj *dir = NULL;
struct yaffs_obj *obj = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 0, NULL, NULL, NULL);
- dir = yaffsfs_FindDirectory(NULL, path, &name, 0, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 0, NULL, NULL, NULL);
+ dir = yaffsfs_FindDirectory(reldir, path, &name, 0, ¬Dir, &loop);
if (!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
return (result == YAFFS_FAIL) ? -1 : 0;
}
+int yaffs_unlink_reldir(struct yaffs_obj *reldir, const YCHAR *path)
+{
+ return yaffsfs_DoUnlink_reldir(reldir, path, 0);
+}
+
+int yaffs_unlink_reldev(struct yaffs_dev *dev, const YCHAR *path)
+{
+ return yaffsfs_DoUnlink_reldir(ROOT_DIR(dev), path, 0);
+}
+
int yaffs_unlink(const YCHAR *path)
{
- return yaffsfs_DoUnlink(path, 0);
+ return yaffs_unlink_reldir(NULL, path);
}
static int rename_file_over_dir(struct yaffs_obj *obj, struct yaffs_obj *newobj)
return 0;
}
-int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
+int yaffs_rename_reldir(struct yaffs_obj *reldir,
+ const YCHAR *oldPath, const YCHAR *newPath)
{
struct yaffs_obj *olddir = NULL;
struct yaffs_obj *newdir = NULL;
yaffsfs_Lock();
- olddir = yaffsfs_FindDirectory(NULL, oldPath, &oldname, 0,
+ olddir = yaffsfs_FindDirectory(reldir, oldPath, &oldname, 0,
¬OldDir, &oldLoop);
- newdir = yaffsfs_FindDirectory(NULL, newPath, &newname, 0,
+ newdir = yaffsfs_FindDirectory(reldir, newPath, &newname, 0,
¬NewDir, &newLoop);
- obj = yaffsfs_FindObject(NULL, oldPath, 0, 0, NULL, NULL, NULL);
- newobj = yaffsfs_FindObject(NULL, newPath, 0, 0, NULL, NULL, NULL);
+ obj = yaffsfs_FindObject(reldir, oldPath, 0, 0, NULL, NULL, NULL);
+ newobj = yaffsfs_FindObject(reldir, newPath, 0, 0, NULL, NULL, NULL);
/* If the object being renamed is a directory and the
* path ended with a "/" then the olddir == obj.
return (result == YAFFS_FAIL) ? -1 : 0;
}
+int yaffs_rename_reldev(struct yaffs_dev *dev, const YCHAR *oldPath,
+ const YCHAR *newPath)
+{
+ return yaffs_rename_reldir(ROOT_DIR(dev), oldPath, newPath);
+}
+int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
+{
+ return yaffs_rename_reldir(NULL, oldPath, newPath);
+}
+
static int yaffsfs_DoStat(struct yaffs_obj *obj, struct yaffs_stat *buf)
{
int retVal = -1;
return retVal;
}
-static int yaffsfs_DoStatOrLStat(const YCHAR *path,
+static int yaffsfs_DoStatOrLStat_reldir(struct yaffs_obj *reldir, const YCHAR *path,
struct yaffs_stat *buf, int doLStat)
{
struct yaffs_obj *obj = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
if (!doLStat && obj)
obj = yaffsfs_FollowLink(obj, 0, &loop);
}
+int yaffs_stat_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ struct yaffs_stat *buf)
+{
+ return yaffsfs_DoStatOrLStat_reldir(reldir, path, buf, 0);
+}
+
+int yaffs_lstat_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ struct yaffs_stat *buf)
+{
+ return yaffsfs_DoStatOrLStat_reldir(reldir, path, buf, 1);
+}
+
+int yaffs_stat_reldev(struct yaffs_dev *dev, const YCHAR *path,
+ struct yaffs_stat *buf)
+{
+ return yaffsfs_DoStatOrLStat_reldir(ROOT_DIR(dev), path, buf, 0);
+}
+
+int yaffs_lstat_reldev(struct yaffs_dev *dev, const YCHAR *path,
+ struct yaffs_stat *buf)
+{
+ return yaffsfs_DoStatOrLStat_reldir(ROOT_DIR(dev), path, buf, 1);
+}
+
int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf)
{
- return yaffsfs_DoStatOrLStat(path, buf, 0);
+ return yaffs_stat_reldir(NULL, path, buf);
}
int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf)
{
- return yaffsfs_DoStatOrLStat(path, buf, 1);
+ return yaffs_lstat_reldir(NULL, path, buf);
}
int yaffs_fstat(int fd, struct yaffs_stat *buf)
return retVal;
}
-int yaffs_utime(const YCHAR *path, const struct yaffs_utimbuf *buf)
+int yaffs_utime_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const struct yaffs_utimbuf *buf)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
if (!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
}
+int yaffs_utime_reldev(struct yaffs_dev *dev, const YCHAR *path,
+ const struct yaffs_utimbuf *buf)
+{
+ return yaffs_utime_reldir(ROOT_DIR(dev), path, buf);
+}
+
+int yaffs_utime(const YCHAR *path, const struct yaffs_utimbuf *buf)
+{
+ return yaffs_utime_reldir(NULL, path, buf);
+}
+
int yaffs_futime(int fd, const struct yaffs_utimbuf *buf)
{
struct yaffs_obj *obj;
#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)
+static int yaffs_do_setxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name, const void *data, int size,
+ int flags, int follow)
{
struct yaffs_obj *obj;
struct yaffs_obj *dir;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
if (follow)
obj = yaffsfs_FollowLink(obj, 0, &loop);
}
+int yaffs_setxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name, const void *data, int size, int flags)
+{
+ return yaffs_do_setxattr_reldir(reldir, path, name, data, size, flags, 1);
+}
+
+int yaffs_setxattr_reldev(struct yaffs_dev *dev, const YCHAR *path,
+ const char *name, const void *data, int size, int flags)
+{
+ return yaffs_setxattr_reldir(ROOT_DIR(dev), path, name, data, size, flags);
+}
+
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);
+ return yaffs_setxattr_reldir(NULL, path, name, data, size, flags);
}
-int yaffs_lsetxattr(const YCHAR *path, const char *name,
+int yaffs_lsetxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path, const char *name,
const void *data, int size, int flags)
{
- return yaffs_do_setxattr(path, name, data, size, flags, 0);
+ return yaffs_do_setxattr_reldir(reldir, path, name, data, size, flags, 0);
+}
+
+int yaffs_lsetxattr_reldev(struct yaffs_dev *dev, const YCHAR *path, const char *name,
+ const void *data, int size, int flags)
+{
+ return yaffs_lsetxattr_reldir(ROOT_DIR(dev), path, name, data, size, flags);
+}
+
+int yaffs_lsetxattr(const YCHAR *path, const char *name,
+ const void *data, int size, int flags)
+{
+ return yaffs_lsetxattr_reldir(NULL, path, name, data, size, flags);
}
int yaffs_fsetxattr(int fd, const char *name,
return retVal;
}
-static int yaffs_do_getxattr(const YCHAR *path, const char *name,
- void *data, int size, int follow)
+static int yaffs_do_getxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name, void *data, int size, int follow)
{
struct yaffs_obj *obj;
struct yaffs_obj *dir;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
if (follow)
obj = yaffsfs_FollowLink(obj, 0, &loop);
}
+int yaffs_getxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name, void *data, int size)
+{
+ return yaffs_do_getxattr_reldir(reldir, path, name, data, size, 1);
+}
+
+int yaffs_getxattr_reldev(struct yaffs_dev *dev, const YCHAR *path, const char *name, void *data, int size)
+{
+ return yaffs_getxattr_reldir(ROOT_DIR(dev), path, name, data, size);
+}
+
int yaffs_getxattr(const YCHAR *path, const char *name, void *data, int size)
{
- return yaffs_do_getxattr(path, name, data, size, 1);
+ return yaffs_getxattr_reldir(NULL, path, name, data, size);
+}
+
+int yaffs_lgetxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name, void *data, int size)
+{
+ return yaffs_do_getxattr_reldir(reldir, path, name, data, size, 0);
+}
+
+int yaffs_lgetxattr_reldev(struct yaffs_dev *dev, const YCHAR *path, const char *name, void *data, int size)
+{
+ return yaffs_lgetxattr_reldir(ROOT_DIR(dev), path, name, data, size);
}
int yaffs_lgetxattr(const YCHAR *path, const char *name, void *data, int size)
{
- return yaffs_do_getxattr(path, name, data, size, 0);
+ return yaffs_lgetxattr_reldir(NULL, path, name, data, size);
}
int yaffs_fgetxattr(int fd, const char *name, void *data, int size)
return retVal;
}
-static int yaffs_do_listxattr(const YCHAR *path, char *data,
- int size, int follow)
+static int yaffs_do_listxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ char *data, int size, int follow)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
if (follow)
obj = yaffsfs_FollowLink(obj, 0, &loop);
}
+int yaffs_listxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ char *data, int size)
+{
+ return yaffs_do_listxattr_reldir(reldir, path, data, size, 1);
+}
+
+int yaffs_listxattr_reldev(struct yaffs_dev *dev, const YCHAR *path, char *data, int size)
+{
+ return yaffs_listxattr_reldir(ROOT_DIR(dev), path, data, size);
+}
+
int yaffs_listxattr(const YCHAR *path, char *data, int size)
{
- return yaffs_do_listxattr(path, data, size, 1);
+ return yaffs_listxattr_reldir(NULL, path, data, size);
+}
+
+int yaffs_llistxattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ char *data, int size)
+{
+ return yaffs_do_listxattr_reldir(reldir, path, data, size, 0);
+}
+
+int yaffs_llistxattr_reldev(struct yaffs_dev *dev, const YCHAR *path, char *data, int size)
+{
+ return yaffs_llistxattr_reldir(ROOT_DIR(dev), path, data, size);
}
int yaffs_llistxattr(const YCHAR *path, char *data, int size)
{
- return yaffs_do_listxattr(path, data, size, 0);
+ return yaffs_llistxattr_reldir(NULL, path, data, size);
}
int yaffs_flistxattr(int fd, char *data, int size)
return retVal;
}
-static int yaffs_do_removexattr(const YCHAR *path, const char *name,
- int follow)
+static int yaffs_do_removexattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name, int follow)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
if (follow)
obj = yaffsfs_FollowLink(obj, 0, &loop);
}
+int yaffs_removexattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name)
+{
+ return yaffs_do_removexattr_reldir(reldir, path, name, 1);
+}
+
+int yaffs_removexattr_reldev(struct yaffs_dev *dev, const YCHAR *path, const char *name)
+{
+ return yaffs_removexattr_reldir(ROOT_DIR(dev), path, name);
+}
+
int yaffs_removexattr(const YCHAR *path, const char *name)
{
- return yaffs_do_removexattr(path, name, 1);
+ return yaffs_removexattr_reldir(NULL, path, name);
+}
+
+int yaffs_lremovexattr_reldir(struct yaffs_obj *reldir, const YCHAR *path,
+ const char *name)
+{
+ return yaffs_do_removexattr_reldir(reldir, path, name, 0);
+}
+
+int yaffs_lremovexattr_reldev(struct yaffs_dev *dev, const YCHAR *path, const char *name)
+{
+ return yaffs_lremovexattr_reldir(ROOT_DIR(dev), path, name);
}
int yaffs_lremovexattr(const YCHAR *path, const char *name)
{
- return yaffs_do_removexattr(path, name, 0);
+ return yaffs_lremovexattr_reldir(NULL, path, name);
}
int yaffs_fremovexattr(int fd, const char *name)
return result == YAFFS_OK ? 0 : -1;
}
-int yaffs_access(const YCHAR *path, int amode)
+int yaffs_access_reldir(struct yaffs_obj *reldir, const YCHAR *path, int amode)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
obj = yaffsfs_FollowLink(obj, 0, &loop);
if (!dir && notDir)
}
-int yaffs_chmod(const YCHAR *path, mode_t mode)
+int yaffs_access_reldev(struct yaffs_dev *dev, const YCHAR *path, int amode)
+{
+ return yaffs_access_reldir(ROOT_DIR(dev), path, amode);
+}
+
+int yaffs_access(const YCHAR *path, int amode)
+{
+ return yaffs_access_reldir(NULL, path, amode);
+}
+
+int yaffs_chmod_reldir(struct yaffs_obj *reldir, const YCHAR *path, mode_t mode)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
obj = yaffsfs_FollowLink(obj, 0, &loop);
if (!dir && notDir)
}
+int yaffs_chmod_reldev(struct yaffs_dev *dev, const YCHAR *path, mode_t mode)
+{
+ return yaffs_chmod_reldir(ROOT_DIR(dev), path, mode);
+}
+
+int yaffs_chmod(const YCHAR *path, mode_t mode)
+{
+ return yaffs_chmod_reldir(NULL, path, mode);
+}
+
int yaffs_fchmod(int fd, mode_t mode)
{
struct yaffs_obj *obj;
return retVal;
}
-int yaffs_mkdir(const YCHAR *path, mode_t mode)
+int yaffs_mkdir_reldir(struct yaffs_obj *reldir, const YCHAR *path, mode_t mode)
{
struct yaffs_obj *parent = NULL;
struct yaffs_obj *dir = NULL;
path = alt_path;
yaffsfs_Lock();
- parent = yaffsfs_FindDirectory(NULL, path, &name, 0, ¬Dir, &loop);
+ parent = yaffsfs_FindDirectory(reldir, path, &name, 0, ¬Dir, &loop);
if (!parent && notDir)
yaffsfs_SetError(-ENOTDIR);
else if (loop)
return retVal;
}
-int yaffs_rmdir(const YCHAR *path)
+int yaffs_mkdir_reldev(struct yaffs_dev *dev, const YCHAR *path, mode_t mode)
+{
+ return yaffs_mkdir_reldir(ROOT_DIR(dev), path, mode);
+}
+
+int yaffs_mkdir(const YCHAR *path, mode_t mode)
+{
+ return yaffs_mkdir_reldir(NULL, path, mode);
+}
+
+int yaffs_rmdir_reldir(struct yaffs_obj *reldir, const YCHAR *path)
{
int result;
YCHAR *alt_path;
}
if (alt_path)
path = alt_path;
- result = yaffsfs_DoUnlink(path, 1);
+ result = yaffsfs_DoUnlink_reldir(reldir, path, 1);
kfree(alt_path);
return result;
}
+int yaffs_rmdir_reldev(struct yaffs_dev *dev, const YCHAR *path)
+{
+ return yaffs_rmdir_reldir(ROOT_DIR(dev), path);
+}
+
+int yaffs_rmdir(const YCHAR *path)
+{
+ return yaffs_rmdir_reldir(NULL, path);
+}
+
+/*
+ * The mount/unmount/sync functions act on devices rather than reldirs.
+ */
void *yaffs_getdev(const YCHAR *path)
{
struct yaffs_dev *dev = NULL;
return (void *)dev;
}
-int yaffs_mount_common(const YCHAR *path, int read_only, int skip_checkpt)
+int yaffs_mount_common(struct yaffs_dev *dev, const YCHAR *path,
+ int read_only, int skip_checkpt)
{
int retVal = -1;
int result = YAFFS_FAIL;
- struct yaffs_dev *dev = NULL;
- if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
- yaffsfs_SetError(-EFAULT);
- return -1;
- }
+ if (!dev) {
+ if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
- yaffs_trace(YAFFS_TRACE_MOUNT, "yaffs: Mounting %s", path);
+ yaffs_trace(YAFFS_TRACE_MOUNT, "yaffs: Mounting %s", path);
- if (yaffsfs_CheckPath(path) < 0) {
- yaffsfs_SetError(-ENAMETOOLONG);
- return -1;
+ if (yaffsfs_CheckPath(path) < 0) {
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
}
yaffsfs_Lock();
yaffsfs_InitHandles();
- dev = yaffsfs_FindMountPoint(path);
+ if (!dev)
+ dev = yaffsfs_FindMountPoint(path);
+
if (dev) {
if (!dev->is_mounted) {
dev->read_only = read_only ? 1 : 0;
}
+int yaffs_mount3_reldev(struct yaffs_dev *dev, int read_only, int skip_checkpt)
+{
+ return yaffs_mount_common(dev, NULL, read_only, skip_checkpt);
+}
+
+int yaffs_mount3(const YCHAR *path, int read_only, int skip_checkpt)
+{
+ return yaffs_mount_common(NULL, path, read_only, skip_checkpt);
+}
+
+int yaffs_mount2_reldev(struct yaffs_dev *dev, int readonly)
+{
+ return yaffs_mount_common(dev, NULL, readonly, 0);
+}
+
int yaffs_mount2(const YCHAR *path, int readonly)
{
- return yaffs_mount_common(path, readonly, 0);
+ return yaffs_mount_common(NULL, path, readonly, 0);
+}
+
+int yaffs_mount_reldev(struct yaffs_dev *dev)
+{
+ return yaffs_mount_common(dev, NULL, 0, 0);
}
int yaffs_mount(const YCHAR *path)
{
- return yaffs_mount_common(path, 0, 0);
+ return yaffs_mount_common(NULL, path, 0, 0);
}
-int yaffs_sync(const YCHAR *path)
+int yaffs_sync_common(struct yaffs_dev *dev, const YCHAR *path)
{
int retVal = -1;
- struct yaffs_dev *dev = NULL;
YCHAR *dummy;
- if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
- yaffsfs_SetError(-EFAULT);
- return -1;
- }
+ if (!dev) {
+ if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
- if (yaffsfs_CheckPath(path) < 0) {
- yaffsfs_SetError(-ENAMETOOLONG);
- return -1;
+ if (yaffsfs_CheckPath(path) < 0) {
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
}
yaffsfs_Lock();
- dev = yaffsfs_FindDevice(path, &dummy);
+ if (!dev)
+ dev = yaffsfs_FindDevice(path, &dummy);
+
if (dev) {
if (!dev->is_mounted)
yaffsfs_SetError(-EINVAL);
return retVal;
}
+int yaffs_sync_reldev(struct yaffs_dev *dev)
+{
+ return yaffs_sync_common(dev, NULL);
+}
+
+int yaffs_sync(const YCHAR *path)
+{
+ return yaffs_sync_common(NULL, path);
+}
+
static int yaffsfs_IsDevBusy(struct yaffs_dev *dev)
{
int i;
return 0;
}
-int yaffs_remount(const YCHAR *path, int force, int read_only)
+int yaffs_remount_common(struct yaffs_dev *dev, const YCHAR *path,
+ int force, int read_only)
{
int retVal = -1;
- struct yaffs_dev *dev = NULL;
if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
yaffsfs_SetError(-EFAULT);
}
yaffsfs_Lock();
- dev = yaffsfs_FindMountPoint(path);
+ if (!dev)
+ dev = yaffsfs_FindMountPoint(path);
+
if (dev) {
if (dev->is_mounted) {
yaffs_flush_whole_cache(dev);
}
-int yaffs_unmount2(const YCHAR *path, int force)
+int yaffs_remount_reldev(struct yaffs_dev *dev, int force, int read_only)
+{
+ return yaffs_remount_common(dev, NULL, force, read_only);
+}
+int yaffs_remount(const YCHAR *path, int force, int read_only)
+{
+ return yaffs_remount_common(NULL, path, force, read_only);
+}
+
+int yaffs_unmount2_common(struct yaffs_dev *dev, const YCHAR *path, int force)
{
int retVal = -1;
- struct yaffs_dev *dev = NULL;
if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
yaffsfs_SetError(-EFAULT);
}
yaffsfs_Lock();
- dev = yaffsfs_FindMountPoint(path);
+ if (!dev)
+ dev = yaffsfs_FindMountPoint(path);
+
if (dev) {
if (dev->is_mounted) {
int inUse;
}
+int yaffs_unmount2_reldev(struct yaffs_dev *dev, int force)
+{
+ return yaffs_unmount2_common(dev, NULL, force);
+}
+
+int yaffs_unmount2(const YCHAR *path, int force)
+{
+ return yaffs_unmount2_common(NULL, path, force);
+}
+
+int yaffs_unmount_reldev(struct yaffs_dev *dev)
+{
+ return yaffs_unmount2_reldev(dev, 0);
+}
+
int yaffs_unmount(const YCHAR *path)
{
return yaffs_unmount2(path, 0);
}
-int yaffs_format(const YCHAR *path,
+int yaffs_format_common(struct yaffs_dev *dev,
+ const YCHAR *path,
int unmount_flag,
int force_unmount_flag,
int remount_flag)
{
int retVal = 0;
- struct yaffs_dev *dev = NULL;
int result;
- if (!path) {
- yaffsfs_SetError(-EFAULT);
- return -1;
- }
+ if (!dev) {
+ if (!path) {
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
- if (yaffsfs_CheckPath(path) < 0) {
- yaffsfs_SetError(-ENAMETOOLONG);
- return -1;
+ if (yaffsfs_CheckPath(path) < 0) {
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
}
yaffsfs_Lock();
- dev = yaffsfs_FindMountPoint(path);
+ if (!dev)
+ dev = yaffsfs_FindMountPoint(path);
if (dev) {
int was_mounted = dev->is_mounted;
yaffsfs_SetError(-EBUSY);
retVal = -1;
} else {
- yaffs_format_dev(dev);
+ yaffs_guts_format_dev(dev);
if(was_mounted && remount_flag) {
result = yaffs_guts_initialise(dev);
if (result == YAFFS_FAIL) {
}
+int yaffs_format_reldev(struct yaffs_dev *dev,
+ int unmount_flag,
+ int force_unmount_flag,
+ int remount_flag)
+{
+ return yaffs_format_common(dev, NULL, unmount_flag,
+ force_unmount_flag, remount_flag);
+}
+
+int yaffs_format(const YCHAR *path,
+ int unmount_flag,
+ int force_unmount_flag,
+ int remount_flag)
+{
+ return yaffs_format_common(NULL, path, unmount_flag,
+ force_unmount_flag, remount_flag);
+}
-Y_LOFF_T yaffs_freespace(const YCHAR *path)
+Y_LOFF_T yaffs_freespace_common(struct yaffs_dev *dev, const YCHAR *path)
{
Y_LOFF_T retVal = -1;
- struct yaffs_dev *dev = NULL;
YCHAR *dummy;
- if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
- yaffsfs_SetError(-EFAULT);
- return -1;
- }
+ if (!dev) {
+ if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
- if (yaffsfs_CheckPath(path) < 0) {
- yaffsfs_SetError(-ENAMETOOLONG);
- return -1;
+ if (yaffsfs_CheckPath(path) < 0) {
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
}
yaffsfs_Lock();
- dev = yaffsfs_FindDevice(path, &dummy);
+ if (!dev)
+ dev = yaffsfs_FindDevice(path, &dummy);
if (dev && dev->is_mounted) {
retVal = yaffs_get_n_free_chunks(dev);
retVal *= dev->data_bytes_per_chunk;
return retVal;
}
-Y_LOFF_T yaffs_totalspace(const YCHAR *path)
+Y_LOFF_T yaffs_freespace_reldev(struct yaffs_dev *dev)
+{
+ return yaffs_freespace_common(dev, NULL);
+}
+
+Y_LOFF_T yaffs_freespace(const YCHAR *path)
+{
+ return yaffs_freespace_common(NULL, path);
+}
+
+Y_LOFF_T yaffs_totalspace_common(struct yaffs_dev *dev, const YCHAR *path)
{
Y_LOFF_T retVal = -1;
- struct yaffs_dev *dev = NULL;
YCHAR *dummy;
- if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
- yaffsfs_SetError(-EFAULT);
- return -1;
- }
+ if (!dev) {
+ if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
- if (yaffsfs_CheckPath(path) < 0) {
- yaffsfs_SetError(-ENAMETOOLONG);
- return -1;
+ if (yaffsfs_CheckPath(path) < 0) {
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
}
yaffsfs_Lock();
- dev = yaffsfs_FindDevice(path, &dummy);
+ if (!dev)
+ dev = yaffsfs_FindDevice(path, &dummy);
if (dev && dev->is_mounted) {
retVal = (dev->param.end_block - dev->param.start_block + 1) -
dev->param.n_reserved_blocks;
return retVal;
}
-int yaffs_inodecount(const YCHAR *path)
+Y_LOFF_T yaffs_totalspace_reldev(struct yaffs_dev *dev)
+{
+ return yaffs_totalspace_common(dev, NULL);
+}
+
+Y_LOFF_T yaffs_totalspace(const YCHAR *path)
+{
+ return yaffs_totalspace_common(NULL, path);
+}
+
+int yaffs_inodecount_common(struct yaffs_dev *dev, const YCHAR *path)
{
Y_LOFF_T retVal = -1;
- struct yaffs_dev *dev = NULL;
YCHAR *dummy;
- if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
- yaffsfs_SetError(-EFAULT);
- return -1;
- }
+ if (!dev) {
+ if (yaffsfs_CheckMemRegion(path, 0, 0) < 0) {
+ yaffsfs_SetError(-EFAULT);
+ return -1;
+ }
- if (yaffsfs_CheckPath(path) < 0) {
- yaffsfs_SetError(-ENAMETOOLONG);
- return -1;
+ if (yaffsfs_CheckPath(path) < 0) {
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
}
yaffsfs_Lock();
- dev = yaffsfs_FindDevice(path, &dummy);
+ if (!dev)
+ dev = yaffsfs_FindDevice(path, &dummy);
if (dev && dev->is_mounted) {
int n_obj = dev->n_obj;
if (n_obj > dev->n_hardlinks)
return retVal;
}
+int yaffs_inodecount_reldev(struct yaffs_dev *dev)
+{
+ return yaffs_inodecount_common(dev, NULL);
+}
+
+int yaffs_inodecount(const YCHAR *path)
+{
+ return yaffs_inodecount_common(NULL, path);
+}
+
void yaffs_add_device(struct yaffs_dev *dev)
{
struct list_head *cfg;
}
-static yaffs_DIR *yaffsfs_opendir_no_lock(const YCHAR *dirname)
+static yaffs_DIR *yaffsfs_opendir_reldir_no_lock(struct yaffs_obj *reldir,
+ const YCHAR *dirname)
{
yaffs_DIR *dir = NULL;
struct yaffs_obj *obj = NULL;
return NULL;
}
- obj = yaffsfs_FindObject(NULL, dirname, 0, 1, NULL, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, dirname, 0, 1, NULL, ¬Dir, &loop);
if (!obj && notDir)
yaffsfs_SetError(-ENOTDIR);
return dir;
}
-yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
+yaffs_DIR *yaffs_opendir_reldir(struct yaffs_obj *reldir, const YCHAR *dirname)
{
yaffs_DIR *ret;
yaffsfs_Lock();
- ret = yaffsfs_opendir_no_lock(dirname);
+ ret = yaffsfs_opendir_reldir_no_lock(reldir, dirname);
yaffsfs_Unlock();
return ret;
}
+yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
+{
+ return yaffs_opendir_reldir(NULL, dirname);
+}
struct yaffs_dirent *yaffsfs_readdir_no_lock(yaffs_DIR * dirp)
{
/* End of directory stuff */
-int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
+int yaffs_symlink_reldir(struct yaffs_obj *reldir,
+ const YCHAR *oldpath, const YCHAR *newpath)
{
struct yaffs_obj *parent = NULL;
struct yaffs_obj *obj;
}
yaffsfs_Lock();
- parent = yaffsfs_FindDirectory(NULL, newpath, &name, 0, ¬Dir, &loop);
+ parent = yaffsfs_FindDirectory(reldir, newpath, &name, 0, ¬Dir, &loop);
if (!parent && notDir)
yaffsfs_SetError(-ENOTDIR);
else if (loop)
obj = yaffs_create_symlink(parent, name, mode, 0, 0, oldpath);
if (obj)
retVal = 0;
- else if (yaffsfs_FindObject
- (NULL, newpath, 0, 0, NULL, NULL, NULL))
+ else if (yaffsfs_FindObject(reldir, newpath, 0, 0,
+ NULL, NULL, NULL))
yaffsfs_SetError(-EEXIST);
else
yaffsfs_SetError(-ENOSPC);
return retVal;
}
+int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
+{
+ return yaffs_symlink_reldir(NULL, oldpath, newpath);
+}
-int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
+int yaffs_readlink_reldir(struct yaffs_obj *reldir,const YCHAR *path,
+ YCHAR *buf, int bufsiz)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, path, 0, 1, &dir, ¬Dir, &loop);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, &dir, ¬Dir, &loop);
if (!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
yaffsfs_Unlock();
return retVal;
}
+int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
+{
+ return yaffs_readlink_reldir(NULL, path, buf, bufsiz);
+}
-int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
+int yaffs_link_reldir(struct yaffs_obj *reldir,
+ const YCHAR *oldpath, const YCHAR *linkpath)
{
/* Creates a link called newpath to existing oldpath */
struct yaffs_obj *obj = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL, oldpath, 0, 1,
+ obj = yaffsfs_FindObject(reldir, oldpath, 0, 1,
&obj_dir, ¬DirObj, &objLoop);
- lnk = yaffsfs_FindObject(NULL, linkpath, 0, 0, NULL, NULL, NULL);
- lnk_dir = yaffsfs_FindDirectory(NULL, linkpath, &newname,
+ lnk = yaffsfs_FindObject(reldir, linkpath, 0, 0, NULL, NULL, NULL);
+ lnk_dir = yaffsfs_FindDirectory(reldir, linkpath, &newname,
0, ¬DirLnk, &lnkLoop);
if ((!obj_dir && notDirObj) || (!lnk_dir && notDirLnk))
return retVal;
}
+int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
+{
+ return yaffs_link_reldir(NULL, oldpath, linkpath);
+}
-int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
+int yaffs_mknod_reldir(struct yaffs_obj *reldir, const YCHAR *pathname,
+ mode_t mode, dev_t dev_val)
{
(void) pathname;
(void) mode;
- (void) dev;
+ (void) dev_val;
+ (void) reldir;
yaffsfs_SetError(-EINVAL);
return -1;
}
+int yaffs_mknod_reldev(struct yaffs_dev *dev, const YCHAR *pathname, mode_t mode, dev_t dev_val)
+{
+ return yaffs_mknod_reldir(ROOT_DIR(dev), pathname, mode, dev_val);
+}
+
+int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev_val)
+{
+ return yaffs_mknod_reldir(NULL, pathname, mode, dev_val);
+}
+
/*
* 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
*/
-int yaffs_n_handles(const YCHAR *path)
+int yaffs_n_handles_reldir(struct yaffs_obj *reldir, const YCHAR *path)
{
struct yaffs_obj *obj;
return -1;
}
- obj = yaffsfs_FindObject(NULL, path, 0, 1, NULL, NULL, NULL);
+ obj = yaffsfs_FindObject(reldir, path, 0, 1, NULL, NULL, NULL);
if (obj)
return yaffsfs_CountHandles(obj);
return -1;
}
+int yaffs_n_handles(const YCHAR *path)
+{
+ return yaffs_n_handles_reldir(NULL, path);
+}
+
int yaffs_get_error(void)
{
return yaffsfs_GetLastError();
return 0;
}
-int yaffs_dump_dev(const YCHAR *path)
+int yaffs_dump_dev_reldir(struct yaffs_obj *reldir, const YCHAR *path)
{
#if 1
(void) path;
+ (void) reldir;
#else
YCHAR *rest;
- struct yaffs_obj *obj = yaffsfs_FindRoot(path, &rest);
- if (obj) {
- struct yaffs_dev *dev = obj->my_dev;
+ if (!reldir)
+ reldir = yaffsfs_FindRoot(path, &rest);
+
+ if (reldir) {
+ struct yaffs_dev *dev = reldir->my_dev;
printf("\n"
"n_page_writes.......... %d\n"
#endif
return 0;
}
+
+int yaffs_dump_dev(const YCHAR *path)
+{
+ return yaffs_dump_dev_reldir(NULL, path);
+}
projects / yaffs2.git / blobdiff