// 创建一个根superblock，用来蕴含我们的根目录。
root_sb = vfs_sb_alloc();
root_sb->root = vfs_d_alloc();
+ root_sb->root->inode = vfs_i_alloc();
}
inline struct hbucket*
return ENAMETOOLONG;
}
if (!VFS_VALID_CHAR(current)) {
- return VFS_EINVLD;
+ return EINVAL;
}
name_content[j++] = current;
if (lookahead) {
errno = ELOOP;
continue;
}
- if ((interim->inode->itype & VFS_INODE_TYPE_SYMLINK) &&
+ if ((interim->inode->itype & VFS_IFSYMLINK) &&
!(options & VFS_WALK_NOFOLLOW) &&
interim->inode->ops.read_symlink) {
errno = interim->inode->ops.read_symlink(interim->inode, &pathname);
} else {
break;
}
- errno =
- __vfs_walk_internal(start, pathname, &interim, component, options);
+ errno = __vfs_walk(start, pathname, &interim, component, options);
counter++;
}
int errno;
struct v_dnode* mnt;
- if (!(errno = vfs_walk(NULL, target, &mnt, NULL, 0))) {
+ if (!(errno = vfs_walk(__current->cwd, target, &mnt, NULL, 0))) {
errno = vfs_mount_at(fs_name, device, mnt);
}
int errno;
struct v_dnode* mnt;
- if (!(errno = vfs_walk(NULL, target, &mnt, NULL, 0))) {
+ if (!(errno = vfs_walk(__current->cwd, target, &mnt, NULL, 0))) {
errno = vfs_unmount_at(mnt);
}
{
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;
return ENOTSUP;
}
+ struct v_inode* inode = dnode->inode;
struct v_file* vfile = cake_grab(file_pile);
memset(vfile, 0, sizeof(*vfile));
vfile->dnode = dnode;
- vfile->inode = dnode->inode;
- dnode->inode->open_count++;
+ vfile->inode = inode;
+ vfile->ref_count = 1;
+ vfile->ops = inode->default_fops;
+
+ if ((inode->itype & VFS_IFFILE) && !inode->pg_cache) {
+ struct pcache* pcache = vzalloc(sizeof(struct pcache));
+ pcache_init(pcache);
+ inode->pg_cache = pcache;
+ }
- int errno = dnode->inode->ops.open(dnode->inode, vfile);
+ int errno = inode->ops.open(inode, vfile);
if (errno) {
cake_release(file_pile, vfile);
} else {
+ dnode->ref_count++;
+ inode->open_count++;
*file = vfile;
}
+
return errno;
}
int
vfs_close(struct v_file* file)
{
- if (!file->ops.close) {
- return ENOTSUP;
- }
-
- int errno = file->ops.close(file);
- if (!errno) {
- if (file->inode->open_count) {
- file->inode->open_count--;
- }
+ int errno = 0;
+ if (!file->ops.close || !(errno = file->ops.close(file))) {
+ file->dnode->ref_count--;
+ file->inode->open_count--;
+ pcache_commit_all(file);
cake_release(file_pile, file);
}
return errno;
vfs_fsync(struct v_file* file)
{
int errno = ENOTSUP;
+ pcache_commit_all(file);
if (file->ops.sync) {
errno = file->ops.sync(file);
}
{
struct v_inode* inode = cake_grab(inode_pile);
memset(inode, 0, sizeof(*inode));
-
return inode;
}
#define FLOCATE_CREATE_EMPTY 1
#define DO_STATUS(errno) SYSCALL_ESTATUS(__current->k_status = errno)
+#define DO_STATUS_OR_RETURN(errno) ({ errno < 0 ? DO_STATUS(errno) : errno; })
+
+#define TEST_FD(fd) (fd >= 0 && fd < VFS_MAX_FD)
+
+int
+__vfs_getfd(int fd, struct v_fd** fd_s)
+{
+ if (TEST_FD(fd) && (*fd_s = __current->fdtable->fds[fd])) {
+ return 0;
+ }
+ return EBADF;
+}
int
__vfs_try_locate_file(const char* path,
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(__current->cwd, 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;
}
int
-__vfs_do_open(struct v_file** file_out, const char* path, int options)
+vfs_do_open(const char* path, int options)
{
- int errno;
+ int errno, fd;
struct v_dnode *dentry, *file;
- struct v_file* opened_file = 0;
+ struct v_file* ofile = 0;
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 = vfs_open(file, &opened_file);
+ errno = dentry->inode->ops.create(dentry->inode);
}
- *file_out = opened_file;
- return errno;
-}
+ if (!errno && (errno = vfs_open(file, &ofile))) {
+ return errno;
+ }
-__DEFINE_LXSYSCALL2(int, open, const char*, path, int, options)
-{
- struct v_file* opened_file;
- int errno = __vfs_do_open(&opened_file, path, options), fd;
+ struct v_inode* o_inode = ofile->inode;
+ if (!(o_inode->itype & VFS_IFSEQDEV) && !(options & FO_DIRECT)) {
+ // XXX Change here accordingly when signature of pcache_r/w changed.
+ ofile->ops.read = pcache_read;
+ ofile->ops.write = pcache_write;
+ }
if (!errno && !(errno = vfs_alloc_fdslot(&fd))) {
struct v_fd* fd_s = vzalloc(sizeof(*fd_s));
- fd_s->file = opened_file;
- fd_s->pos = opened_file->inode->fsize & -((options & FO_APPEND) != 0);
+ ofile->f_pos = ofile->inode->fsize & -((options & FO_APPEND) != 0);
+ fd_s->file = ofile;
+ fd_s->flags = options;
__current->fdtable->fds[fd] = fd_s;
return fd;
}
- return DO_STATUS(errno);
+ return errno;
+}
+
+__DEFINE_LXSYSCALL2(int, open, const char*, path, int, options)
+{
+ int errno = vfs_do_open(path, options);
+ return DO_STATUS_OR_RETURN(errno);
}
-#define TEST_FD(fd) (fd >= 0 && fd < VFS_MAX_FD)
-#define GET_FD(fd, fd_s) (TEST_FD(fd) && (fd_s = __current->fdtable->fds[fd]))
__DEFINE_LXSYSCALL1(int, close, int, fd)
{
struct v_fd* fd_s;
- int errno;
- if (!GET_FD(fd, fd_s)) {
- errno = EBADF;
- } else if (!(errno = vfs_close(fd_s->file))) {
- vfree(fd_s);
- __current->fdtable->fds[fd] = 0;
+ int errno = 0;
+ if ((errno = __vfs_getfd(fd, &fd_s))) {
+ 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;
int errno;
- if (!GET_FD(fd, fd_s)) {
- errno = EBADF;
- } else if (!(fd_s->file->inode->itype & VFS_INODE_TYPE_DIR)) {
+
+ if ((errno = __vfs_getfd(fd, &fd_s))) {
+ goto done;
+ }
+
+ if (!(fd_s->file->inode->itype & VFS_IFDIR)) {
errno = ENOTDIR;
} else {
struct dir_context dctx =
{
struct v_dnode *parent, *dir;
struct hstr component = HSTR(valloc(VFS_NAME_MAXLEN), 0);
- int errno = vfs_walk(NULL, path, &parent, &component, VFS_WALK_PARENT);
+ int errno =
+ vfs_walk(__current->cwd, path, &parent, &component, VFS_WALK_PARENT);
if (errno) {
goto done;
}
errno = ENOTSUP;
} else if (!parent->inode->ops.mkdir) {
errno = ENOTSUP;
- } else if (!(parent->inode->itype & VFS_INODE_TYPE_DIR)) {
+ } else if (!(parent->inode->itype & VFS_IFDIR)) {
errno = ENOTDIR;
} else {
dir = vfs_d_alloc();
{
int errno = 0;
struct v_fd* fd_s;
- if (!GET_FD(fd, fd_s)) {
- errno = EBADF;
- } 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;
- }
+ if ((errno = __vfs_getfd(fd, &fd_s))) {
+ goto done;
+ }
+
+ struct v_file* file = fd_s->file;
+ if ((file->inode->itype & VFS_IFDIR)) {
+ errno = EISDIR;
+ goto done;
}
+ cpu_enable_interrupt();
+ errno = file->ops.read(file, buf, count, file->f_pos);
+ cpu_disable_interrupt();
+
+ if (errno > 0) {
+ file->f_pos += errno;
+ return errno;
+ }
+
+done:
return DO_STATUS(errno);
}
{
int errno = 0;
struct v_fd* fd_s;
- if (!GET_FD(fd, fd_s)) {
- errno = EBADF;
- } 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;
- }
+ if ((errno = __vfs_getfd(fd, &fd_s))) {
+ goto done;
+ }
+
+ struct v_file* file = fd_s->file;
+ if ((file->inode->itype & VFS_IFDIR)) {
+ errno = EISDIR;
+ goto done;
+ }
+
+ cpu_enable_interrupt();
+ errno = file->ops.write(file, buf, count, file->f_pos);
+ cpu_disable_interrupt();
+
+ if (errno > 0) {
+ file->f_pos += errno;
+ return errno;
}
+done:
return DO_STATUS(errno);
}
{
int errno = 0;
struct v_fd* fd_s;
- if (!GET_FD(fd, fd_s)) {
- errno = EBADF;
- } else {
- size_t fpos = fd_s->file->f_pos;
- switch (options) {
- case FSEEK_CUR:
- fpos = (size_t)((int)fd_s->file->f_pos + offset);
- break;
- case FSEEK_END:
- fpos = (size_t)((int)fd_s->file->inode->fsize + offset);
- break;
- case FSEEK_SET:
- fpos = offset;
- break;
+ if ((errno = __vfs_getfd(fd, &fd_s))) {
+ goto done;
+ }
- default:
- break;
- }
- fd_s->pos = fpos;
+ struct v_file* file = fd_s->file;
+ size_t fpos = file->f_pos;
+ switch (options) {
+ case FSEEK_CUR:
+ fpos = (size_t)((int)file->f_pos + offset);
+ break;
+ case FSEEK_END:
+ fpos = (size_t)((int)file->inode->fsize + offset);
+ break;
+ case FSEEK_SET:
+ fpos = offset;
+ break;
+ }
+ if (!file->ops.seek || !(errno = file->ops.seek(file, fpos))) {
+ file->f_pos = fpos;
}
+done:
return DO_STATUS(errno);
}
{
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 = __vfs_getfd(fd, &fd_s))) {
+ goto done;
}
+ struct v_dnode* dnode;
+ errno = vfs_get_path(fd_s->file->dnode, buf, size, 0);
+
if (errno >= 0) {
return errno;
}
+done:
return DO_STATUS(errno);
}
{
int errno;
struct v_dnode* dnode;
- if (!(errno = vfs_walk(NULL, path, &dnode, NULL, VFS_WALK_NOFOLLOW))) {
+ if (!(errno =
+ vfs_walk(__current->cwd, path, &dnode, NULL, VFS_WALK_NOFOLLOW))) {
errno = vfs_readlink(dnode, buf, size);
}
{
int errno;
struct v_fd* fd_s;
- if (!GET_FD(dirfd, fd_s)) {
- errno = EBADF;
- } else {
- struct v_dnode* dnode;
- if (!(errno = vfs_walk(fd_s->file->dnode,
- pathname,
- &dnode,
- NULL,
- VFS_WALK_NOFOLLOW))) {
- errno = vfs_readlink(fd_s->file->dnode, buf, size);
- }
+ if ((errno = __vfs_getfd(dirfd, &fd_s))) {
+ goto done;
+ }
+
+ struct v_dnode* dnode;
+ if (!(errno = vfs_walk(
+ fd_s->file->dnode, pathname, &dnode, NULL, VFS_WALK_NOFOLLOW))) {
+ errno = vfs_readlink(fd_s->file->dnode, buf, size);
}
if (errno >= 0) {
return errno;
}
+done:
return DO_STATUS(errno);
}
{
int errno;
struct v_dnode* dnode;
- if ((errno = vfs_walk(NULL, pathname, &dnode, NULL, 0))) {
+ if ((errno = vfs_walk(__current->cwd, pathname, &dnode, NULL, 0))) {
goto done;
}
if ((dnode->super_block->fs->types & FSTYPE_ROFS)) {
goto done;
}
- if ((dnode->inode->itype & VFS_INODE_TYPE_DIR)) {
+ if ((dnode->inode->itype & VFS_IFDIR)) {
errno = dnode->inode->ops.rmdir(dnode->inode);
} else {
errno = ENOTDIR;
int errno;
if (inode->open_count) {
errno = EBUSY;
- } else if (!(inode->itype & VFS_INODE_TYPE_DIR)) {
+ } else if (!(inode->itype & VFS_IFDIR)) {
// TODO handle symbolic link and type other than regular file
errno = inode->ops.unlink(inode);
if (!errno) {
{
int errno;
struct v_dnode* dnode;
- if ((errno = vfs_walk(NULL, pathname, &dnode, NULL, 0))) {
+ if ((errno = vfs_walk(__current->cwd, pathname, &dnode, NULL, 0))) {
goto done;
}
if ((dnode->super_block->fs->types & FSTYPE_ROFS)) {
{
int errno;
struct v_fd* fd_s;
- if (!GET_FD(fd, fd_s)) {
- errno = EBADF;
- } else {
- struct v_dnode* dnode;
- if (!(errno = vfs_walk(fd_s->file->dnode, pathname, &dnode, NULL, 0))) {
- errno = __vfs_do_unlink(dnode->inode);
- }
+ if ((errno = __vfs_getfd(fd, &fd_s))) {
+ goto done;
+ }
+
+ struct v_dnode* dnode;
+ if (!(errno = vfs_walk(fd_s->file->dnode, pathname, &dnode, NULL, 0))) {
+ errno = __vfs_do_unlink(dnode->inode);
}
done:
{
int errno;
struct v_fd* fd_s;
- if (!GET_FD(fildes, fd_s)) {
- errno = EBADF;
- } else {
+ if (!(errno = __vfs_getfd(fildes, &fd_s))) {
errno = vfs_fsync(fd_s->file);
}
}
int
-__vfs_dup_fd(struct v_fd* old, struct v_fd** new)
+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++;
+
+ *new = copied;
return errno;
}
-__DEFINE_LXSYSCALL2(int, dup2, int, oldfd, int, newfd)
+int
+vfs_dup2(int oldfd, int newfd)
{
if (newfd == oldfd) {
return newfd;
int errno;
struct v_fd *oldfd_s, *newfd_s;
- if (!GET_FD(oldfd, oldfd_s) || TEST_FD(newfd)) {
+ if ((errno = __vfs_getfd(oldfd, &oldfd_s))) {
+ goto done;
+ }
+
+ if (!TEST_FD(newfd)) {
errno = EBADF;
goto done;
}
+
newfd_s = __current->fdtable->fds[newfd];
if (newfd_s && (errno = vfs_close(newfd_s))) {
goto done;
}
- if (!(errno = __vfs_dup_fd(oldfd_s, &newfd_s))) {
+ if (!(errno = vfs_dup_fd(oldfd_s, &newfd_s))) {
__current->fdtable->fds[newfd] = newfd_s;
return newfd;
}
return DO_STATUS(errno);
}
+__DEFINE_LXSYSCALL2(int, dup2, int, oldfd, int, newfd)
+{
+ return vfs_dup2(oldfd, newfd);
+}
+
__DEFINE_LXSYSCALL1(int, dup, int, oldfd)
{
int errno, newfd;
struct v_fd *oldfd_s, *newfd_s;
- if (!GET_FD(oldfd, oldfd_s)) {
- errno = EBADF;
- } else if (!(errno = vfs_alloc_fdslot(&newfd)) &&
- !(errno = __vfs_dup_fd(oldfd_s, &newfd_s))) {
+ if ((errno = __vfs_getfd(oldfd, &oldfd_s))) {
+ goto done;
+ }
+
+ if (!(errno = vfs_alloc_fdslot(&newfd)) &&
+ !(errno = vfs_dup_fd(oldfd_s, &newfd_s))) {
__current->fdtable->fds[newfd] = newfd_s;
return newfd;
}
+done:
return DO_STATUS(errno);
}
{
int errno;
struct v_dnode* dnode;
- if ((errno = vfs_walk(NULL, pathname, &dnode, NULL, 0))) {
+ if ((errno = vfs_walk(__current->cwd, pathname, &dnode, NULL, 0))) {
goto done;
}
if ((dnode->super_block->fs->types & FSTYPE_ROFS)) {
done:
return DO_STATUS(errno);
+}
+
+int
+__vfs_do_chdir(struct v_dnode* dnode)
+{
+ int errno = 0;
+ if (!(dnode->inode->itype & VFS_IFDIR)) {
+ errno = ENOTDIR;
+ goto done;
+ }
+
+ if (__current->cwd) {
+ __current->cwd->ref_count--;
+ }
+
+ dnode->ref_count++;
+ __current->cwd = dnode;
+
+done:
+ return errno;
+}
+
+__DEFINE_LXSYSCALL1(int, chdir, const char*, path)
+{
+ struct v_dnode* dnode;
+ int errno = 0;
+
+ if ((errno = vfs_walk(__current->cwd, path, &dnode, NULL, 0))) {
+ goto done;
+ }
+
+ errno = __vfs_do_chdir(dnode);
+
+done:
+ return DO_STATUS(errno);
+}
+
+__DEFINE_LXSYSCALL1(int, fchdir, int, fd)
+{
+ struct v_fd* fd_s;
+ int errno = 0;
+
+ if ((errno = __vfs_getfd(fd, &fd_s))) {
+ goto done;
+ }
+
+ errno = __vfs_do_chdir(fd_s->file->dnode);
+
+done:
+ return DO_STATUS(errno);
+}
+
+__DEFINE_LXSYSCALL2(char*, getcwd, char*, buf, size_t, size)
+{
+ int errno = 0;
+ char* ret_ptr = 0;
+ if (size < 2) {
+ errno = ERANGE;
+ goto done;
+ }
+
+ if (!__current->cwd) {
+ *buf = PATH_DELIM;
+ goto done;
+ }
+
+ size_t len = vfs_get_path(__current->cwd, buf, size, 0);
+ if (len == size) {
+ errno = ERANGE;
+ goto done;
+ }
+
+ buf[len + 1] = '\0';
+
+ ret_ptr = buf;
+
+done:
+ __current->k_status = errno;
+ return ret_ptr;
}
\ No newline at end of file
git://scm.lunaixsky.com / lunaix-os.git / blobdiff