}
int
-vfs_walk(struct v_dnode* start,
- const char* path,
- struct v_dnode** dentry,
- struct hstr* component,
- int walk_options)
+__vfs_walk(struct v_dnode* start,
+ const char* path,
+ struct v_dnode** dentry,
+ struct hstr* component,
+ int walk_options)
{
int errno = 0;
int i = 0, j = 0;
return ENAMETOOLONG;
}
if (!VFS_VALID_CHAR(current)) {
- return VFS_EINVLD;
+ return EINVAL;
}
name_content[j++] = current;
if (lookahead) {
return errno;
}
+#define VFS_MAX_SYMLINK 16
+
+int
+vfs_walk(struct v_dnode* start,
+ const char* path,
+ struct v_dnode** dentry,
+ struct hstr* component,
+ int options)
+{
+ struct v_dnode* interim;
+ char* pathname = path;
+ int errno = __vfs_walk(start, path, &interim, component, options);
+ int counter = 0;
+
+ while (!errno) {
+ if (counter >= VFS_MAX_SYMLINK) {
+ errno = ELOOP;
+ continue;
+ }
+ if ((interim->inode->itype & VFS_INODE_TYPE_SYMLINK) &&
+ !(options & VFS_WALK_NOFOLLOW) &&
+ interim->inode->ops.read_symlink) {
+ errno = interim->inode->ops.read_symlink(interim->inode, &pathname);
+ if (errno) {
+ break;
+ }
+ } else {
+ break;
+ }
+ errno = __vfs_walk(start, pathname, &interim, component, options);
+ counter++;
+ }
+
+ *dentry = errno ? 0 : interim;
+
+ return errno;
+}
+
int
vfs_mount(const char* target, const char* fs_name, bdev_t device)
{
{
struct filesystem* fs = fsm_get(fs_name);
if (!fs)
- return VFS_ENOFS;
+ return ENODEV;
struct v_superblock* sb = vfs_sb_alloc();
sb->dev = device;
sb->fs_id = fs_id++;
int errno = 0;
struct v_superblock* sb = mnt_point->super_block;
if (!sb) {
- return VFS_EBADMNT;
+ return EINVAL;
}
if (!(errno = sb->fs->unmount(sb))) {
struct v_dnode* fs_root = sb->root;
vfile->dnode = dnode;
vfile->inode = dnode->inode;
+ vfile->ref_count = 1;
dnode->inode->open_count++;
+ if ((dnode->inode->itype & VFS_INODE_TYPE_FILE) &&
+ !dnode->inode->pg_cache) {
+ struct pcache* pcache = vzalloc(sizeof(struct pcache));
+ pcache_init(pcache);
+ dnode->inode->pg_cache = pcache;
+ }
+
int errno = dnode->inode->ops.open(dnode->inode, vfile);
if (errno) {
cake_release(file_pile, vfile);
int
vfs_close(struct v_file* file)
{
- if (!file->ops.close) {
- return ENOTSUP;
- }
-
- int errno = file->ops.close(file);
- if (!errno) {
+ int errno = 0;
+ if (!file->ops.close || !(errno = file->ops.close(file))) {
if (file->inode->open_count) {
file->inode->open_count--;
}
+ pcache_commit_all(file);
cake_release(file_pile, file);
}
return errno;
{
struct v_inode* inode = cake_grab(inode_pile);
memset(inode, 0, sizeof(*inode));
-
return inode;
}
char name_str[VFS_NAME_MAXLEN];
struct hstr name = HSTR(name_str, 0);
int errno;
- if (!(errno = vfs_walk(NULL, path, fdir, &name, VFS_WALK_PARENT))) {
- errno = vfs_walk(*fdir, name.value, file, NULL, 0);
- if (errno == ENOENT && (options & FLOCATE_CREATE_EMPTY)) {
- struct v_dnode* file_new;
- file_new = vfs_d_alloc();
- file_new->name =
- HHSTR(valloc(VFS_NAME_MAXLEN), name.len, name.hash);
- strcpy(file_new->name.value, name_str);
- *file = file_new;
-
- llist_append(&(*fdir)->children, &file_new->siblings);
- }
+ if ((errno = vfs_walk(NULL, path, fdir, &name, VFS_WALK_PARENT))) {
+ return errno;
+ }
+
+ errno = vfs_walk(*fdir, name.value, file, NULL, 0);
+ if (errno != ENOENT || !(options & FLOCATE_CREATE_EMPTY)) {
+ return errno;
+ }
+
+ if (!(errno = (*fdir)->inode->ops.create((*fdir)->inode))) {
+ struct v_dnode* file_new;
+ file_new = vfs_d_alloc();
+ file_new->name = HHSTR(valloc(VFS_NAME_MAXLEN), name.len, name.hash);
+ strcpy(file_new->name.value, name_str);
+ *file = file_new;
+
+ llist_append(&(*fdir)->children, &file_new->siblings);
}
return errno;
errno = __vfs_try_locate_file(path, &dentry, &file, 0);
if (errno != ENOENT && (options & FO_CREATE)) {
- errno = dentry->inode->ops.create(dentry->inode, opened_file);
- } else if (!errno) {
+ errno = dentry->inode->ops.create(dentry->inode);
+ }
+
+ if (!errno) {
errno = vfs_open(file, &opened_file);
}
if (!errno && !(errno = vfs_alloc_fdslot(&fd))) {
struct v_fd* fd_s = vzalloc(sizeof(*fd_s));
+ opened_file->f_pos =
+ opened_file->inode->fsize & -((options & FO_APPEND) != 0);
fd_s->file = opened_file;
- fd_s->pos = opened_file->inode->fsize & -((options & FO_APPEND) != 0);
+ fd_s->flags = options;
__current->fdtable->fds[fd] = fd_s;
return fd;
}
__DEFINE_LXSYSCALL1(int, close, int, fd)
{
struct v_fd* fd_s;
- int errno;
+ int errno = 0;
if (!GET_FD(fd, fd_s)) {
errno = EBADF;
- } else if (!(errno = vfs_close(fd_s->file))) {
- vfree(fd_s);
- __current->fdtable->fds[fd] = 0;
+ goto done_err;
+ }
+
+ if (fd_s->file->ref_count > 1) {
+ fd_s->file->ref_count--;
+ } else if ((errno = vfs_close(fd_s->file))) {
+ goto done_err;
}
+ vfree(fd_s);
+ __current->fdtable->fds[fd] = 0;
+
+done_err:
return DO_STATUS(errno);
}
struct v_fd* fd_s;
if (!GET_FD(fd, fd_s)) {
errno = EBADF;
+ goto done;
+ }
+
+ struct v_file* file = fd_s->file;
+ if ((file->inode->itype & VFS_INODE_TYPE_DIR)) {
+ errno = EISDIR;
+ goto done;
+ }
+
+ if ((fd_s->flags & FO_DIRECT)) {
+ errno = file->ops.read(file, buf, count, file->f_pos);
} else {
- struct v_file* file = fd_s->file;
- file->f_pos = fd_s->pos;
- if ((errno = file->ops.read(file, buf, count)) >= 0) {
- fd_s->pos += errno;
- }
+ errno = pcache_read(file, buf, count);
+ }
+
+ if (errno > 0) {
+ file->f_pos += errno;
+ return errno;
}
+done:
return DO_STATUS(errno);
}
struct v_fd* fd_s;
if (!GET_FD(fd, fd_s)) {
errno = EBADF;
+ goto done;
+ }
+
+ struct v_file* file = fd_s->file;
+ if ((file->inode->itype & VFS_INODE_TYPE_DIR)) {
+ errno = EISDIR;
+ goto done;
+ }
+
+ if ((fd_s->flags & FO_DIRECT)) {
+ errno = file->ops.write(file, buf, count, file->f_pos);
} else {
- struct v_file* file = fd_s->file;
- file->f_pos = fd_s->pos;
- if ((errno = file->ops.write(file, buf, count)) >= 0) {
- fd_s->pos += errno;
- }
+ errno = pcache_write(file, buf, count);
+ }
+
+ if (errno > 0) {
+ file->f_pos += errno;
+ return errno;
}
+done:
return DO_STATUS(errno);
}
if (!GET_FD(fd, fd_s)) {
errno = EBADF;
} else {
- size_t fpos = fd_s->file->f_pos;
+ struct v_file* file = fd_s->file;
+ size_t fpos = file->f_pos;
switch (options) {
case FSEEK_CUR:
- fpos = (size_t)((int)fd_s->file->f_pos + offset);
+ fpos = (size_t)((int)file->f_pos + offset);
break;
case FSEEK_END:
- fpos = (size_t)((int)fd_s->file->inode->fsize + offset);
+ fpos = (size_t)((int)file->inode->fsize + offset);
break;
case FSEEK_SET:
fpos = offset;
break;
-
- default:
- break;
}
- fd_s->pos = fpos;
+ if (!file->ops.seek || !(errno = file->ops.seek(file, fpos))) {
+ file->f_pos = fpos;
+ }
}
return DO_STATUS(errno);
}
int
-vfs_readlink(struct v_dnode* dnode, char* buf, size_t size, int depth)
+vfs_get_path(struct v_dnode* dnode, char* buf, size_t size, int depth)
{
if (!dnode) {
return 0;
return ELOOP;
}
- size_t len = vfs_readlink(dnode->parent, buf, size, depth + 1);
+ size_t len = vfs_get_path(dnode->parent, buf, size, depth + 1);
if (len >= size) {
return len;
return len;
}
+int
+vfs_readlink(struct v_dnode* dnode, char* buf, size_t size)
+{
+ char* link;
+ if (dnode->inode->ops.read_symlink) {
+ int errno = dnode->inode->ops.read_symlink(dnode->inode, &link);
+ strncpy(buf, link, size);
+ return errno;
+ }
+ return 0;
+}
+
+__DEFINE_LXSYSCALL3(int, realpathat, int, fd, char*, buf, size_t, size)
+{
+ int errno;
+ struct v_fd* fd_s;
+ if (!GET_FD(fd, fd_s)) {
+ errno = EBADF;
+ } else {
+ struct v_dnode* dnode;
+ errno = vfs_get_path(fd_s->file->dnode, buf, size, 0);
+ }
+
+ if (errno >= 0) {
+ return errno;
+ }
+
+ return DO_STATUS(errno);
+}
+
__DEFINE_LXSYSCALL3(int, readlink, const char*, path, char*, buf, size_t, size)
{
int errno;
struct v_dnode* dnode;
- if (!(errno = vfs_walk(NULL, path, &dnode, NULL, 0))) {
- errno = vfs_readlink(dnode, buf, size, 0);
+ if (!(errno = vfs_walk(NULL, path, &dnode, NULL, VFS_WALK_NOFOLLOW))) {
+ errno = vfs_readlink(dnode, buf, size);
}
if (errno >= 0) {
errno = EBADF;
} else {
struct v_dnode* dnode;
- if (!(errno = vfs_walk(fd_s->file->dnode, pathname, &dnode, NULL, 0))) {
- errno = vfs_readlink(fd_s->file->dnode, buf, size, 0);
+ if (!(errno = vfs_walk(fd_s->file->dnode,
+ pathname,
+ &dnode,
+ NULL,
+ VFS_WALK_NOFOLLOW))) {
+ errno = vfs_readlink(fd_s->file->dnode, buf, size);
}
}
__vfs_dup_fd(struct v_fd* old, struct v_fd** new)
{
int errno = 0;
- struct v_file* newopened;
- if (!(errno = vfs_open(old->file->dnode, &newopened))) {
- *new = cake_grab(fd_pile);
- **new = (struct v_fd){ .file = newopened,
- .pos = old->pos,
- .flags = old->flags };
- }
+ struct v_fd* copied = cake_grab(fd_pile);
+
+ memcpy(copied, old, sizeof(struct v_fd));
+ old->file->ref_count++;
return errno;
}
return newfd;
}
+ return DO_STATUS(errno);
+}
+
+__DEFINE_LXSYSCALL2(int,
+ symlink,
+ const char*,
+ pathname,
+ const char*,
+ link_target)
+{
+ int errno;
+ struct v_dnode* dnode;
+ if ((errno = vfs_walk(NULL, pathname, &dnode, NULL, 0))) {
+ goto done;
+ }
+ if ((dnode->super_block->fs->types & FSTYPE_ROFS)) {
+ errno = EROFS;
+ goto done;
+ }
+ if (!dnode->inode->ops.symlink) {
+ errno = ENOTSUP;
+ goto done;
+ }
+
+ errno = dnode->inode->ops.symlink(dnode->inode, link_target);
+
+done:
return DO_STATUS(errno);
}
\ No newline at end of file
git://scm.lunaixsky.com / lunaix-os.git / blobdiff