X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/f8bd95b7a13dfe54d800e2d7ecdb0329f0798289..b60166b327a9108b07e3069fa6568a451529ffd9:/lunaix-os/kernel/fs/vfs.c diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c index 7959fc3..c59584a 100644 --- a/lunaix-os/kernel/fs/vfs.c +++ b/lunaix-os/kernel/fs/vfs.c @@ -40,7 +40,7 @@ we can do similar thing in Lunaix? A block device emulation above the regular file when we mount it on. 10. (device) device number (dev_t) allocation - [good idea] :: composition + [good idea] :: composition (CHECKED) */ #include @@ -56,7 +56,7 @@ #include -#include +#include static struct cake_pile* dnode_pile; static struct cake_pile* inode_pile; @@ -110,7 +110,7 @@ vfs_init() atomic_fetch_add(&vfs_sysroot->ref_count, 1); } -inline struct hbucket* +static inline struct hbucket* __dcache_hash(struct v_dnode* parent, u32_t* hash) { u32_t _hash = *hash; @@ -201,7 +201,7 @@ vfs_open(struct v_dnode* dnode, struct v_file** file) vfile->ref_count = ATOMIC_VAR_INIT(1); vfile->ops = inode->default_fops; - if ((inode->itype & VFS_IFFILE) && !inode->pg_cache) { + if ((inode->itype & F_MFILE) && !inode->pg_cache) { struct pcache* pcache = vzalloc(sizeof(struct pcache)); pcache_init(pcache); pcache->master = inode; @@ -436,7 +436,7 @@ vfs_d_free(struct v_dnode* dnode) vfs_dcache_remove(pos); } - vfree(dnode->name.value); + vfree((void*)dnode->name.value); cake_release(dnode_pile, dnode); } @@ -490,7 +490,6 @@ vfs_i_alloc(struct v_superblock* sb) inode->atime = inode->ctime; inode->mtime = inode->ctime; -done: lru_use_one(inode_lru, &inode->lru); return inode; } @@ -516,6 +515,7 @@ vfs_i_free(struct v_inode* inode) #define FLOCATE_CREATE_EMPTY 1 #define FLOCATE_CREATE_ONLY 2 +#define FLOCATE_NOFOLLOW 4 int vfs_getfd(int fd, struct v_fd** fd_s) @@ -534,14 +534,18 @@ __vfs_try_locate_file(const char* path, { char name_str[VFS_NAME_MAXLEN]; struct hstr name = HSTR(name_str, 0); - int errno; + int errno, woption = 0; + + if ((options & FLOCATE_NOFOLLOW)) { + woption |= VFS_WALK_NOFOLLOW; + } name_str[0] = 0; - if ((errno = vfs_walk_proc(path, fdir, &name, VFS_WALK_PARENT))) { + if ((errno = vfs_walk_proc(path, fdir, &name, woption | VFS_WALK_PARENT))) { return errno; } - errno = vfs_walk(*fdir, name.value, file, NULL, 0); + errno = vfs_walk(*fdir, name.value, file, NULL, woption); if (errno != ENOENT && (options & FLOCATE_CREATE_ONLY)) { return EEXIST; @@ -576,12 +580,17 @@ __vfs_try_locate_file(const char* path, int vfs_do_open(const char* path, int options) { - int errno, fd; + int errno, fd, loptions = 0; struct v_dnode *dentry, *file; struct v_file* ofile = NULL; - errno = __vfs_try_locate_file( - path, &dentry, &file, (options & FO_CREATE) ? FLOCATE_CREATE_EMPTY : 0); + if ((options & FO_CREATE)) { + loptions |= FLOCATE_CREATE_EMPTY; + } else if ((options & FO_NOFOLLOW)) { + loptions |= FLOCATE_NOFOLLOW; + } + + errno = __vfs_try_locate_file(path, &dentry, &file, loptions); if (!errno && !(errno = vfs_alloc_fdslot(&fd))) { @@ -652,14 +661,13 @@ __DEFINE_LXSYSCALL2(int, sys_readdir, int, fd, struct lx_dirent*, dent) lock_inode(inode); - if (!(inode->itype & VFS_IFDIR)) { + if ((inode->itype & F_FILE)) { errno = ENOTDIR; } else { - struct dir_context dctx = - (struct dir_context){ .cb_data = dent, - .index = dent->d_offset, - .read_complete_callback = - __vfs_readdir_callback }; + struct dir_context dctx = (struct dir_context){ + .cb_data = dent, + .index = dent->d_offset, + .read_complete_callback = __vfs_readdir_callback}; errno = 1; if (dent->d_offset == 0) { __vfs_readdir_callback(&dctx, vfs_dot.value, vfs_dot.len, DT_DIR); @@ -690,7 +698,7 @@ __DEFINE_LXSYSCALL3(int, read, int, fd, void*, buf, size_t, count) } struct v_file* file = fd_s->file; - if ((file->inode->itype & VFS_IFDIR)) { + if (!(file->inode->itype & F_FILE)) { errno = EISDIR; goto done; } @@ -731,7 +739,7 @@ __DEFINE_LXSYSCALL3(int, write, int, fd, void*, buf, size_t, count) goto done; } - if ((file->inode->itype & VFS_IFDIR)) { + if (!(file->inode->itype & F_FILE)) { errno = EISDIR; goto done; } @@ -779,11 +787,10 @@ __DEFINE_LXSYSCALL3(int, lseek, int, fd, int, offset, int, options) int fpos = file->f_pos; switch (options) { case FSEEK_CUR: - overflow = __builtin_sadd_overflow((int)file->f_pos, offset, &fpos); + overflow = sadd_overflow((int)file->f_pos, offset, &fpos); break; case FSEEK_END: - overflow = - __builtin_sadd_overflow((int)file->inode->fsize, offset, &fpos); + overflow = sadd_overflow((int)file->inode->fsize, offset, &fpos); break; case FSEEK_SET: fpos = offset; @@ -853,13 +860,12 @@ vfs_readlink(struct v_dnode* dnode, char* buf, size_t size) int vfs_get_dtype(int itype) { - switch (itype) { - case VFS_IFDIR: - return DT_DIR; - case VFS_IFSYMLINK: - return DT_SYMLINK; - default: - return DT_PIPE; + if ((itype & VFS_IFSYMLINK) == VFS_IFSYMLINK) { + return DT_SYMLINK; + } else if (!(itype & VFS_IFFILE)) { + return DT_DIR; + } else { + return DT_FILE; } } @@ -897,16 +903,8 @@ __DEFINE_LXSYSCALL3(int, readlink, const char*, path, char*, buf, size_t, size) return DO_STATUS(errno); } -__DEFINE_LXSYSCALL4(int, - readlinkat, - int, - dirfd, - const char*, - pathname, - char*, - buf, - size_t, - size) +__DEFINE_LXSYSCALL4( + int, readlinkat, int, dirfd, const char*, pathname, char*, buf, size_t, size) { int errno; struct v_fd* fd_s; @@ -914,6 +912,8 @@ __DEFINE_LXSYSCALL4(int, goto done; } + pathname = pathname ? pathname : ""; + struct v_dnode* dnode; if (!(errno = vfs_walk( fd_s->file->dnode, pathname, &dnode, NULL, VFS_WALK_NOFOLLOW))) { @@ -975,7 +975,7 @@ __DEFINE_LXSYSCALL1(int, rmdir, const char*, pathname) lock_dnode(parent); lock_inode(parent->inode); - if ((dnode->inode->itype & VFS_IFDIR)) { + if (!(dnode->inode->itype & F_MFILE)) { errno = parent->inode->ops->rmdir(parent->inode, dnode); if (!errno) { vfs_dcache_remove(dnode); @@ -1003,6 +1003,11 @@ __DEFINE_LXSYSCALL1(int, mkdir, const char*, path) goto done; } + if (!(errno = vfs_walk(parent, name_value, &dir, NULL, 0))) { + errno = EEXIST; + goto done; + } + if ((errno = vfs_check_writable(parent))) { goto done; } @@ -1019,7 +1024,7 @@ __DEFINE_LXSYSCALL1(int, mkdir, const char*, path) errno = ENOTSUP; } else if (!parent->inode->ops->mkdir) { errno = ENOTSUP; - } else if (!(parent->inode->itype & VFS_IFDIR)) { + } else if ((parent->inode->itype & F_FILE)) { errno = ENOTDIR; } else if (!(errno = parent->inode->ops->mkdir(parent->inode, dir))) { vfs_dcache_add(parent, dir); @@ -1053,9 +1058,7 @@ __vfs_do_unlink(struct v_dnode* dnode) if (inode->open_count) { errno = EBUSY; - } else if (!(inode->itype & VFS_IFDIR)) { - // The underlying unlink implementation should handle - // symlink case + } else if ((inode->itype & F_MFILE)) { errno = inode->ops->unlink(inode); if (!errno) { vfs_d_free(dnode); @@ -1108,10 +1111,8 @@ __DEFINE_LXSYSCALL2(int, link, const char*, oldpath, const char*, newpath) errno = __vfs_try_locate_file(oldpath, &dentry, &to_link, 0); if (!errno) { errno = __vfs_try_locate_file( - newpath, &name_dentry, &name_file, FLOCATE_CREATE_EMPTY); + newpath, &name_dentry, &name_file, FLOCATE_CREATE_ONLY); if (!errno) { - errno = EEXIST; - } else if (name_file) { errno = vfs_link(to_link, name_file); } } @@ -1200,12 +1201,8 @@ done: return DO_STATUS(errno); } -__DEFINE_LXSYSCALL2(int, - symlink, - const char*, - pathname, - const char*, - link_target) +__DEFINE_LXSYSCALL2( + int, symlink, const char*, pathname, const char*, link_target) { int errno; struct v_dnode *dnode, *file; @@ -1214,7 +1211,7 @@ __DEFINE_LXSYSCALL2(int, goto done; } - if (errno = vfs_check_writable(file)) { + if ((errno = vfs_check_writable(file))) { goto done; } @@ -1243,14 +1240,19 @@ void vfs_ref_dnode(struct v_dnode* dnode) { atomic_fetch_add(&dnode->ref_count, 1); - mnt_mkbusy(dnode->mnt); + + if (dnode->mnt) { + mnt_mkbusy(dnode->mnt); + } } void vfs_unref_dnode(struct v_dnode* dnode) { atomic_fetch_sub(&dnode->ref_count, 1); - mnt_chillax(dnode->mnt); + if (dnode->mnt) { + mnt_chillax(dnode->mnt); + } } int @@ -1260,7 +1262,7 @@ vfs_do_chdir(struct proc_info* proc, struct v_dnode* dnode) lock_dnode(dnode); - if (!(dnode->inode->itype & VFS_IFDIR)) { + if ((dnode->inode->itype & F_FILE)) { errno = ENOTDIR; goto done; } @@ -1287,7 +1289,7 @@ __DEFINE_LXSYSCALL1(int, chdir, const char*, path) goto done; } - errno = vfs_do_chdir(__current, dnode); + errno = vfs_do_chdir((struct proc_info*)__current, dnode); done: return DO_STATUS(errno); @@ -1302,7 +1304,7 @@ __DEFINE_LXSYSCALL1(int, fchdir, int, fd) goto done; } - errno = vfs_do_chdir(__current, fd_s->file->dnode); + errno = vfs_do_chdir((struct proc_info*)__current, fd_s->file->dnode); done: return DO_STATUS(errno); @@ -1335,7 +1337,7 @@ __DEFINE_LXSYSCALL2(char*, getcwd, char*, buf, size_t, size) ret_ptr = buf; done: - __current->k_status = errno; + syscall_result(errno); return ret_ptr; } @@ -1348,7 +1350,7 @@ vfs_do_rename(struct v_dnode* current, struct v_dnode* target) return 0; } - if (errno = vfs_check_writable(current)) { + if ((errno = vfs_check_writable(current))) { return errno; } @@ -1432,6 +1434,47 @@ __DEFINE_LXSYSCALL2(int, rename, const char*, oldpath, const char*, newpath) errno = vfs_do_rename(cur, target); done: - vfree(name.value); + vfree((void*)name.value); + return DO_STATUS(errno); +} + +__DEFINE_LXSYSCALL2(int, fstat, int, fd, struct file_stat*, stat) +{ + int errno = 0; + struct v_fd* fds; + + if ((errno = vfs_getfd(fd, &fds))) { + goto done; + } + + struct v_inode* vino = fds->file->inode; + struct device* fdev = vino->sb->dev; + + *stat = (struct file_stat){.st_ino = vino->id, + .st_blocks = vino->lb_usage, + .st_size = vino->fsize, + .mode = vino->itype, + .st_ioblksize = PG_SIZE, + .st_blksize = vino->sb->blksize}; + + if (VFS_DEVFILE(vino->itype)) { + struct device* rdev = resolve_device(vino->data); + if (!rdev || rdev->magic != DEV_STRUCT_MAGIC) { + errno = EINVAL; + goto done; + } + + stat->st_rdev = (dev_t){.meta = rdev->ident.fn_grp, + .unique = rdev->ident.unique, + .index = rdev->dev_uid}; + } + + if (fdev) { + stat->st_dev = (dev_t){.meta = fdev->ident.fn_grp, + .unique = fdev->ident.unique, + .index = fdev->dev_uid}; + } + +done: return DO_STATUS(errno); } \ No newline at end of file