X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/fb2d2e17e3ffc4bddf944dc67a6d86fe9453bb5a..a7384053efe345d199440720b437a28e91058ff3:/lunaix-os/kernel/fs/vfs.c

diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c
index 8edc9fd..b879185 100644
--- a/lunaix-os/kernel/fs/vfs.c
+++ b/lunaix-os/kernel/fs/vfs.c
@@ -25,15 +25,16 @@
             maybe a unified mount_point structure that maintain a referencing
             counter on any dnodes within the subtree? Such a counter will only
             increament if a file is opened or a dnode is being used as working
-            directory and decreamenting conversely.
+            directory and decreamenting conversely. (CHECKED)
  6. (mount) Ability to track all mount points (including sub-mounts)
-            so we can be confident to clean up everything when we unmount.
+            so we can be confident to clean up everything when we
+            unmount. (CHECKED)
  7. (mount) Figure out a way to acquire the device represented by a dnode.
             so it can be used to mount. (e.g. we wish to get `struct device*`
             out of the dnode at /dev/sda)
             [tip] we should pay attention at twifs and add a private_data field
-            under struct v_dnode?
- 8. (mount) Then, we should refactor on mount/unmount mechanism.
+            under struct v_dnode? (CHECKED)
+ 8. (mount) Then, we should refactor on mount/unmount mechanism. (CHECKED)
  9. (mount) (future) Ability to mount any thing? e.g. Linux can mount a disk
                     image file using a so called "loopback" pseudo device. Maybe
                     we can do similar thing in Lunaix? A block device emulation
@@ -56,10 +57,6 @@
 #include <lunaix/fs/twifs.h>
 
 #define PATH_DELIM '/'
-#define HASHTABLE_BITS 10
-#define HASHTABLE_SIZE (1 << HASHTABLE_BITS)
-#define HASH_MASK (HASHTABLE_SIZE - 1)
-#define HASHBITS (32 - HASHTABLE_BITS)
 
 #define unlock_inode(inode) mutex_unlock(&inode->lock)
 #define lock_inode(inode)                                                      \
@@ -81,8 +78,8 @@ static struct cake_pile* file_pile;
 static struct cake_pile* superblock_pile;
 static struct cake_pile* fd_pile;
 
-static struct v_superblock* root_sb;
-static struct hbucket *dnode_cache, *inode_cache;
+struct v_dnode* vfs_sysroot;
+static struct hbucket* dnode_cache;
 
 static struct lru_zone *dnode_lru, *inode_lru;
 
@@ -113,8 +110,7 @@ vfs_init()
     superblock_pile =
       cake_new_pile("sb_cache", sizeof(struct v_superblock), 1, 0);
 
-    dnode_cache = vzalloc(HASHTABLE_SIZE * sizeof(struct hbucket));
-    inode_cache = vzalloc(HASHTABLE_SIZE * sizeof(struct hbucket));
+    dnode_cache = vzalloc(VFS_HASHTABLE_SIZE * sizeof(struct hbucket));
 
     dnode_lru = lru_new_zone(__vfs_try_evict_dnode);
     inode_lru = lru_new_zone(__vfs_try_evict_inode);
@@ -122,9 +118,9 @@ vfs_init()
     hstr_rehash(&vfs_ddot, HSTR_FULL_HASH);
     hstr_rehash(&vfs_dot, HSTR_FULL_HASH);
 
-    // 创建一个根superblock，用来蕴含我们的根目录。
-    root_sb = vfs_sb_alloc();
-    root_sb->root = vfs_d_alloc();
+    // 创建一个根dnode。
+    vfs_sysroot = vfs_d_alloc(NULL, &vfs_empty);
+    atomic_fetch_add(&vfs_sysroot->ref_count, 1);
 }
 
 inline struct hbucket*
@@ -134,9 +130,9 @@ __dcache_hash(struct v_dnode* parent, uint32_t* hash)
     // 与parent的指针值做加法，来减小碰撞的可能性。
     _hash += (uint32_t)parent;
     // 确保低位更加随机
-    _hash = _hash ^ (_hash >> HASHBITS);
+    _hash = _hash ^ (_hash >> VFS_HASHBITS);
     *hash = _hash;
-    return &dnode_cache[_hash & HASH_MASK];
+    return &dnode_cache[_hash & VFS_HASH_MASK];
 }
 
 struct v_dnode*
@@ -168,6 +164,7 @@ vfs_dcache_add(struct v_dnode* parent, struct v_dnode* dnode)
     atomic_fetch_add(&dnode->ref_count, 1);
     dnode->parent = parent;
     llist_append(&parent->children, &dnode->siblings);
+
     struct hbucket* bucket = __dcache_hash(parent, &dnode->name.hash);
     hlist_add(&bucket->head, &dnode->hash_list);
 }
@@ -206,7 +203,10 @@ __vfs_walk(struct v_dnode* start,
         if ((walk_options & VFS_WALK_FSRELATIVE) && start) {
             start = start->super_block->root;
         } else {
-            start = root_sb->root;
+            start = vfs_sysroot;
+            if (!vfs_sysroot->mnt) {
+                panick("vfs: no root");
+            }
         }
         i++;
     }
@@ -218,7 +218,7 @@ __vfs_walk(struct v_dnode* start,
     struct hstr name = HSTR(name_content, 0);
 
     char current = path[i++], lookahead;
-    while (current) {
+    while (current && current_level) {
         lookahead = path[i++];
         if (current != PATH_DELIM) {
             if (j >= VFS_NAME_MAXLEN - 1) {
@@ -257,38 +257,34 @@ __vfs_walk(struct v_dnode* start,
         dnode = vfs_dcache_lookup(current_level, &name);
 
         if (!dnode) {
-            dnode = vfs_d_alloc();
+            dnode = vfs_d_alloc(current_level, &name);
 
             if (!dnode) {
                 errno = ENOMEM;
                 goto error;
             }
 
-            hstrcpy(&dnode->name, &name);
+            struct v_inode* current_inode = current_level->inode;
 
-            lock_inode(current_level->inode);
+            lock_inode(current_inode);
 
-            errno =
-              current_level->inode->ops.dir_lookup(current_level->inode, dnode);
+            errno = current_inode->ops->dir_lookup(current_inode, dnode);
 
             if (errno == ENOENT && (walk_options & VFS_WALK_MKPARENT)) {
-                if (!current_level->inode->ops.mkdir) {
+                if (!current_inode->ops->mkdir) {
                     errno = ENOTSUP;
                 } else {
-                    errno = current_level->inode->ops.mkdir(
-                      current_level->inode, dnode);
+                    errno = current_inode->ops->mkdir(current_inode, dnode);
                 }
             }
 
-            unlock_inode(current_level->inode);
+            vfs_dcache_add(current_level, dnode);
+            unlock_inode(current_inode);
 
             if (errno) {
                 unlock_dnode(current_level);
-                vfree(dnode->name.value);
                 goto cleanup;
             }
-
-            vfs_dcache_add(current_level, dnode);
         }
 
         unlock_dnode(current_level);
@@ -323,16 +319,18 @@ vfs_walk(struct v_dnode* start,
     int errno = __vfs_walk(start, path, &interim, component, options);
     int counter = 0;
 
+    // FIXME This is NOT a correct way to resolve symlink!
     while (!errno && interim->inode && (options & VFS_WALK_NOFOLLOW)) {
         if (counter >= VFS_MAX_SYMLINK) {
             errno = ELOOP;
             continue;
         }
         if ((interim->inode->itype & VFS_IFSYMLINK) &&
-            interim->inode->ops.read_symlink) {
+            interim->inode->ops->read_symlink) {
 
             lock_inode(interim->inode);
-            errno = interim->inode->ops.read_symlink(interim->inode, &pathname);
+            errno =
+              interim->inode->ops->read_symlink(interim->inode, &pathname);
             unlock_inode(interim->inode);
 
             if (errno) {
@@ -350,94 +348,17 @@ vfs_walk(struct v_dnode* start,
     return errno;
 }
 
-int
-vfs_mount(const char* target, const char* fs_name, struct device* device)
-{
-    int errno;
-    struct v_dnode* mnt;
-
-    if (!(errno = vfs_walk(__current->cwd, target, &mnt, NULL, 0))) {
-        errno = vfs_mount_at(fs_name, device, mnt);
-    }
-
-    return errno;
-}
-
-int
-vfs_unmount(const char* target)
-{
-    int errno;
-    struct v_dnode* mnt;
-
-    if (!(errno = vfs_walk(__current->cwd, target, &mnt, NULL, 0))) {
-        errno = vfs_unmount_at(mnt);
-    }
-
-    return errno;
-}
-
-int
-vfs_mount_at(const char* fs_name,
-             struct device* device,
-             struct v_dnode* mnt_point)
-{
-    if (mnt_point->inode && !(mnt_point->inode->itype & VFS_IFDIR)) {
-        return ENOTDIR;
-    }
-
-    struct filesystem* fs = fsm_get(fs_name);
-    if (!fs) {
-        return ENODEV;
-    }
-
-    struct v_superblock* sb = vfs_sb_alloc();
-    sb->dev = device;
-    sb->fs_id = fs->fs_id;
-
-    int errno = 0;
-    if (!(errno = fs->mount(sb, mnt_point))) {
-        sb->fs = fs;
-        sb->root = mnt_point;
-        mnt_point->super_block = sb;
-        llist_append(&root_sb->sb_list, &sb->sb_list);
-    }
-
-    return errno;
-}
-
-int
-vfs_unmount_at(struct v_dnode* mnt_point)
-{
-    // FIXME deal with the detached dcache subtree
-    int errno = 0;
-    struct v_superblock* sb = mnt_point->super_block;
-    if (!sb) {
-        return EINVAL;
-    }
-
-    if (sb->root != mnt_point) {
-        return EINVAL;
-    }
-
-    if (!(errno = sb->fs->unmount(sb))) {
-        struct v_dnode* fs_root = sb->root;
-        vfs_dcache_remove(fs_root);
-
-        llist_delete(&sb->sb_list);
-        vfs_sb_free(sb);
-        vfs_d_free(fs_root);
-    }
-    return errno;
-}
-
 int
 vfs_open(struct v_dnode* dnode, struct v_file** file)
 {
-    if (!dnode->inode || !dnode->inode->ops.open) {
+    if (!dnode->inode || !dnode->inode->ops->open) {
         return ENOTSUP;
     }
 
     struct v_inode* inode = dnode->inode;
+
+    lock_inode(inode);
+
     struct v_file* vfile = cake_grab(file_pile);
     memset(vfile, 0, sizeof(*vfile));
 
@@ -453,16 +374,19 @@ vfs_open(struct v_dnode* dnode, struct v_file** file)
         inode->pg_cache = pcache;
     }
 
-    int errno = inode->ops.open(inode, vfile);
+    int errno = inode->ops->open(inode, vfile);
     if (errno) {
         cake_release(file_pile, vfile);
     } else {
         atomic_fetch_add(&dnode->ref_count, 1);
         inode->open_count++;
+        mnt_mkbusy(dnode->mnt);
 
         *file = vfile;
     }
 
+    unlock_inode(inode);
+
     return errno;
 }
 
@@ -484,9 +408,9 @@ vfs_link(struct v_dnode* to_link, struct v_dnode* name)
     lock_inode(to_link->inode);
     if (to_link->super_block->root != name->super_block->root) {
         errno = EXDEV;
-    } else if (!to_link->inode->ops.link) {
+    } else if (!to_link->inode->ops->link) {
         errno = ENOTSUP;
-    } else if (!(errno = to_link->inode->ops.link(to_link->inode, name))) {
+    } else if (!(errno = to_link->inode->ops->link(to_link->inode, name))) {
         vfs_assign_inode(name, to_link->inode);
     }
     unlock_inode(to_link->inode);
@@ -498,9 +422,10 @@ int
 vfs_close(struct v_file* file)
 {
     int errno = 0;
-    if (!file->ops.close || !(errno = file->ops.close(file))) {
+    if (!(errno = file->ops->close(file))) {
         atomic_fetch_sub(&file->dnode->ref_count, 1);
         file->inode->open_count--;
+        mnt_chillax(file->dnode->mnt);
 
         pcache_commit_all(file->inode);
         cake_release(file_pile, file);
@@ -515,8 +440,9 @@ vfs_fsync(struct v_file* file)
 
     int errno = ENOTSUP;
     pcache_commit_all(file->inode);
-    if (file->ops.sync) {
-        errno = file->ops.sync(file->inode);
+
+    if (file->ops->sync) {
+        errno = file->ops->sync(file);
     }
 
     unlock_inode(file->inode);
@@ -542,12 +468,14 @@ vfs_sb_alloc()
     struct v_superblock* sb = cake_grab(superblock_pile);
     memset(sb, 0, sizeof(*sb));
     llist_init_head(&sb->sb_list);
+    sb->i_cache = vzalloc(VFS_HASHTABLE_SIZE * sizeof(struct hbucket));
     return sb;
 }
 
 void
 vfs_sb_free(struct v_superblock* sb)
 {
+    vfree(sb->i_cache);
     cake_release(superblock_pile, sb);
 }
 
@@ -576,7 +504,7 @@ __vfs_try_evict_inode(struct lru_node* obj)
 }
 
 struct v_dnode*
-vfs_d_alloc()
+vfs_d_alloc(struct v_dnode* parent, struct hstr* name)
 {
     struct v_dnode* dnode = cake_grab(dnode_pile);
     if (!dnode) {
@@ -595,6 +523,12 @@ vfs_d_alloc()
     dnode->ref_count = ATOMIC_VAR_INIT(0);
     dnode->name = HHSTR(vzalloc(VFS_NAME_MAXLEN), 0, 0);
 
+    hstrcpy(&dnode->name, name);
+
+    if (parent) {
+        dnode->super_block = parent->super_block;
+    }
+
     lru_use_one(dnode_lru, &dnode->lru);
 
     return dnode;
@@ -603,13 +537,14 @@ vfs_d_alloc()
 void
 vfs_d_free(struct v_dnode* dnode)
 {
-    assert(dnode->ref_count == 0);
+    assert(dnode->ref_count == 1);
 
     if (dnode->inode) {
         assert(dnode->inode->link_count > 0);
         dnode->inode->link_count--;
     }
 
+    vfs_dcache_remove(dnode);
     // Make sure the children de-referencing their parent.
     // With lru presented, the eviction will be propagated over the entire
     // detached subtree eventually
@@ -624,48 +559,66 @@ vfs_d_free(struct v_dnode* dnode)
 }
 
 struct v_inode*
-vfs_i_alloc(dev_t device_id, uint32_t inode_id)
+vfs_i_find(struct v_superblock* sb, uint32_t i_id)
 {
-    // 我们这里假设每个文件系统与设备是一一对应（毕竟一个分区不可能有两个不同的文件系统）
-    // 而每个文件系统所产生的 v_inode 缓存必须要和其他文件系统产生的区分开来。
-    // 这也就是说，每个 v_inode 的 id
-    // 必须要由设备ID，和该虚拟inode缓存所对应的物理inode
-    // 相对于其所在的文件系统的id，进行组成！
-    inode_id = hash_32(inode_id ^ (-device_id), HASH_SIZE_BITS);
-    inode_id = (inode_id >> HASHBITS) ^ inode_id;
-
-    struct hbucket* slot = &inode_cache[inode_id & HASH_MASK];
+    struct hbucket* slot = &sb->i_cache[i_id & VFS_HASH_MASK];
     struct v_inode *pos, *n;
     hashtable_bucket_foreach(slot, pos, n, hash_list)
     {
-        if (pos->id == inode_id) {
-            goto done;
+        if (pos->id == i_id) {
+            lru_use_one(inode_lru, &pos->lru);
+            return pos;
         }
     }
 
-    if (!(pos = cake_grab(inode_pile))) {
+    return NULL;
+}
+
+void
+vfs_i_addhash(struct v_inode* inode)
+{
+    struct hbucket* slot = &inode->sb->i_cache[inode->id & VFS_HASH_MASK];
+
+    hlist_delete(&inode->hash_list);
+    hlist_add(&slot->head, &inode->hash_list);
+}
+
+struct v_inode*
+vfs_i_alloc(struct v_superblock* sb)
+{
+    assert(sb->ops.init_inode);
+
+    struct v_inode* inode;
+    if (!(inode = cake_grab(inode_pile))) {
         lru_evict_half(inode_lru);
-        if (!(pos = cake_grab(inode_pile))) {
+        if (!(inode = cake_grab(inode_pile))) {
             return NULL;
         }
     }
 
-    memset(pos, 0, sizeof(*pos));
+    memset(inode, 0, sizeof(*inode));
+    mutex_init(&inode->lock);
 
-    pos->id = inode_id;
+    sb->ops.init_inode(sb, inode);
 
-    mutex_init(&pos->lock);
-
-    hlist_add(&slot->head, &pos->hash_list);
+    inode->sb = sb;
+    inode->ctime = clock_unixtime();
+    inode->atime = inode->ctime;
+    inode->mtime = inode->ctime;
 
 done:
-    lru_use_one(inode_lru, &pos->lru);
-    return pos;
+    lru_use_one(inode_lru, &inode->lru);
+    return inode;
 }
 
 void
 vfs_i_free(struct v_inode* inode)
 {
+    if (inode->pg_cache) {
+        pcache_release(inode->pg_cache);
+        vfree(inode->pg_cache);
+    }
+    inode->ops->sync(inode);
     hlist_delete(&inode->hash_list);
     cake_release(inode_pile, inode);
 }
@@ -674,11 +627,6 @@ vfs_i_free(struct v_inode* 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)
 {
@@ -708,21 +656,17 @@ __vfs_try_locate_file(const char* path,
     }
 
     struct v_dnode* parent = *fdir;
-    struct v_dnode* file_new = vfs_d_alloc();
+    struct v_dnode* file_new = vfs_d_alloc(parent, &name);
 
     if (!file_new) {
         return ENOMEM;
     }
 
-    hstrcpy(&file_new->name, &name);
-
     lock_dnode(parent);
 
-    if (!(errno = parent->inode->ops.create(parent->inode, file_new))) {
-        *file = file_new;
-
+    if (!(errno = parent->inode->ops->create(parent->inode, file_new))) {
         vfs_dcache_add(parent, file_new);
-        llist_append(&parent->children, &file_new->siblings);
+        *file = file_new;
     } else {
         vfs_d_free(file_new);
     }
@@ -747,11 +691,6 @@ vfs_do_open(const char* path, int options)
     }
 
     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));
@@ -817,7 +756,7 @@ __DEFINE_LXSYSCALL2(int, readdir, int, fd, struct dirent*, dent)
 
     lock_inode(inode);
 
-    if (!(fd_s->file->inode->itype & VFS_IFDIR)) {
+    if (!(inode->itype & VFS_IFDIR)) {
         errno = ENOTDIR;
     } else {
         struct dir_context dctx =
@@ -825,25 +764,25 @@ __DEFINE_LXSYSCALL2(int, readdir, int, fd, struct dirent*, 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, 0);
         } else if (dent->d_offset == 1) {
             __vfs_readdir_callback(&dctx, vfs_ddot.value, vfs_ddot.len, 0);
         } else {
             dctx.index -= 2;
-            if ((errno = fd_s->file->ops.readdir(inode, &dctx))) {
+            if ((errno = fd_s->file->ops->readdir(fd_s->file, &dctx)) != 1) {
                 unlock_inode(inode);
                 goto done;
             }
         }
-        errno = 0;
         dent->d_offset++;
     }
 
     unlock_inode(inode);
 
 done:
-    return DO_STATUS(errno);
+    return DO_STATUS_OR_RETURN(errno);
 }
 
 __DEFINE_LXSYSCALL3(int, read, int, fd, void*, buf, size_t, count)
@@ -864,8 +803,13 @@ __DEFINE_LXSYSCALL3(int, read, int, fd, void*, buf, size_t, count)
 
     file->inode->atime = clock_unixtime();
 
-    __SYSCALL_INTERRUPTIBLE(
-      { errno = file->ops.read(file->inode, buf, count, file->f_pos); })
+    __SYSCALL_INTERRUPTIBLE({
+        if ((file->inode->itype & VFS_IFSEQDEV) || (fd_s->flags & FO_DIRECT)) {
+            errno = file->ops->read(file->inode, buf, count, file->f_pos);
+        } else {
+            errno = pcache_read(file->inode, buf, count, file->f_pos);
+        }
+    })
 
     if (errno > 0) {
         file->f_pos += errno;
@@ -897,8 +841,13 @@ __DEFINE_LXSYSCALL3(int, write, int, fd, void*, buf, size_t, count)
 
     file->inode->mtime = clock_unixtime();
 
-    __SYSCALL_INTERRUPTIBLE(
-      { errno = file->ops.write(file->inode, buf, count, file->f_pos); })
+    __SYSCALL_INTERRUPTIBLE({
+        if ((file->inode->itype & VFS_IFSEQDEV) || (fd_s->flags & FO_DIRECT)) {
+            errno = file->ops->write(file->inode, buf, count, file->f_pos);
+        } else {
+            errno = pcache_write(file->inode, buf, count, file->f_pos);
+        }
+    })
 
     if (errno > 0) {
         file->f_pos += errno;
@@ -936,7 +885,7 @@ __DEFINE_LXSYSCALL3(int, lseek, int, fd, int, offset, int, options)
             fpos = offset;
             break;
     }
-    if (!file->ops.seek || !(errno = file->ops.seek(file->inode, fpos))) {
+    if (!(errno = file->ops->seek(file->inode, fpos))) {
         file->f_pos = fpos;
     }
 
@@ -979,10 +928,10 @@ vfs_readlink(struct v_dnode* dnode, char* buf, size_t size)
 {
     const char* link;
     struct v_inode* inode = dnode->inode;
-    if (inode->ops.read_symlink) {
+    if (inode->ops->read_symlink) {
         lock_inode(inode);
 
-        int errno = inode->ops.read_symlink(inode, &link);
+        int errno = inode->ops->read_symlink(inode, &link);
         strncpy(buf, link, size);
 
         unlock_inode(inode);
@@ -1101,7 +1050,7 @@ __DEFINE_LXSYSCALL1(int, rmdir, const char*, pathname)
     lock_inode(parent->inode);
 
     if ((dnode->inode->itype & VFS_IFDIR)) {
-        errno = parent->inode->ops.rmdir(parent->inode, dnode);
+        errno = parent->inode->ops->rmdir(parent->inode, dnode);
         if (!errno) {
             vfs_dcache_remove(dnode);
         }
@@ -1120,29 +1069,33 @@ done:
 __DEFINE_LXSYSCALL1(int, mkdir, const char*, path)
 {
     int errno = 0;
-    struct v_dnode *parent, *dir = vfs_d_alloc();
+    struct v_dnode *parent, *dir;
+    char name_value[VFS_NAME_MAXLEN];
+    struct hstr name = HHSTR(name_value, 0, 0);
 
     if (!dir) {
         errno = ENOMEM;
         goto done;
     }
 
-    if ((errno = vfs_walk(
-           __current->cwd, path, &parent, &dir->name, VFS_WALK_PARENT))) {
+    if ((errno =
+           vfs_walk(__current->cwd, path, &parent, &name, VFS_WALK_PARENT))) {
         goto done;
     }
 
+    dir = vfs_d_alloc(parent, &name);
+
     lock_dnode(parent);
     lock_inode(parent->inode);
 
     if ((parent->super_block->fs->types & FSTYPE_ROFS)) {
         errno = ENOTSUP;
-    } else if (!parent->inode->ops.mkdir) {
+    } else if (!parent->inode->ops->mkdir) {
         errno = ENOTSUP;
     } else if (!(parent->inode->itype & VFS_IFDIR)) {
         errno = ENOTDIR;
-    } else if (!(errno = parent->inode->ops.mkdir(parent->inode, dir))) {
-        llist_append(&parent->children, &dir->siblings);
+    } else if (!(errno = parent->inode->ops->mkdir(parent->inode, dir))) {
+        vfs_dcache_add(parent, dir);
         goto cleanup;
     }
 
@@ -1172,9 +1125,8 @@ __vfs_do_unlink(struct v_dnode* dnode)
     } else if (!(inode->itype & VFS_IFDIR)) {
         // The underlying unlink implementation should handle
         //  symlink case
-        errno = inode->ops.unlink(inode);
+        errno = inode->ops->unlink(inode);
         if (!errno) {
-            vfs_dcache_remove(dnode);
             vfs_d_free(dnode);
         }
     } else {
@@ -1336,14 +1288,14 @@ __DEFINE_LXSYSCALL2(int,
         errno = EROFS;
         goto done;
     }
-    if (!dnode->inode->ops.set_symlink) {
+    if (!dnode->inode->ops->set_symlink) {
         errno = ENOTSUP;
         goto done;
     }
 
     lock_inode(dnode->inode);
 
-    errno = dnode->inode->ops.set_symlink(dnode->inode, link_target);
+    errno = dnode->inode->ops->set_symlink(dnode->inode, link_target);
 
     unlock_inode(dnode->inode);
 
@@ -1364,10 +1316,12 @@ __vfs_do_chdir(struct v_dnode* dnode)
     }
 
     if (__current->cwd) {
-        atomic_fetch_add(&__current->cwd->ref_count, 1);
+        atomic_fetch_sub(&__current->cwd->ref_count, 1);
+        mnt_chillax(__current->cwd->mnt);
     }
 
-    atomic_fetch_sub(&dnode->ref_count, 1);
+    atomic_fetch_add(&dnode->ref_count, 1);
+    mnt_mkbusy(dnode->mnt);
     __current->cwd = dnode;
 
     unlock_dnode(dnode);
@@ -1471,7 +1425,8 @@ vfs_do_rename(struct v_dnode* current, struct v_dnode* target)
         goto cleanup;
     }
 
-    if ((errno = current->inode->ops.rename(current->inode, current, target))) {
+    if ((errno =
+           current->inode->ops->rename(current->inode, current, target))) {
         unlock_dnode(target);
         goto cleanup;
     }
@@ -1481,7 +1436,7 @@ vfs_do_rename(struct v_dnode* current, struct v_dnode* target)
     vfs_dcache_rehash(newparent, current);
 
     // detach target
-    vfs_dcache_remove(target);
+    vfs_d_free(target);
 
     unlock_dnode(target);
 
@@ -1512,7 +1467,8 @@ __DEFINE_LXSYSCALL2(int, rename, const char*, oldpath, const char*, newpath)
 
     errno = vfs_walk(target_parent, name.value, &target, NULL, 0);
     if (errno == ENOENT) {
-        target = vfs_d_alloc();
+        target = vfs_d_alloc(target_parent, &name);
+        vfs_dcache_add(target_parent, target);
     } else if (errno) {
         goto done;
     }
@@ -1522,58 +1478,9 @@ __DEFINE_LXSYSCALL2(int, rename, const char*, oldpath, const char*, newpath)
         goto done;
     }
 
-    hstrcpy(&target->name, &name);
-
-    if (!(errno = vfs_do_rename(cur, target))) {
-        vfs_d_free(target);
-    }
+    errno = vfs_do_rename(cur, target);
 
 done:
     vfree(name.value);
     return DO_STATUS(errno);
-}
-
-__DEFINE_LXSYSCALL3(int,
-                    mount,
-                    const char*,
-                    source,
-                    const char*,
-                    target,
-                    const char*,
-                    fstype)
-{
-    struct v_dnode *dev, *mnt;
-    int errno = 0;
-
-    if ((errno = vfs_walk(__current->cwd, source, &dev, NULL, 0))) {
-        goto done;
-    }
-
-    if ((errno = vfs_walk(__current->cwd, target, &mnt, NULL, 0))) {
-        goto done;
-    }
-
-    if (!(dev->inode->itype & VFS_IFVOLDEV)) {
-        errno = ENOTDEV;
-        goto done;
-    }
-
-    if (mnt->ref_count > 1) {
-        errno = EBUSY;
-        goto done;
-    }
-
-    // FIXME should not touch the underlying fs!
-    struct device* device =
-      (struct device*)((struct twifs_node*)dev->inode->data)->data;
-
-    errno = vfs_mount_at(fstype, device, mnt);
-
-done:
-    return DO_STATUS(errno);
-}
-
-__DEFINE_LXSYSCALL1(int, unmount, const char*, target)
-{
-    return vfs_unmount(target);
 }
\ No newline at end of file