X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/2687264120b44704961375849a51d69b17ce585a..a7384053efe345d199440720b437a28e91058ff3:/lunaix-os/kernel/fs/vfs.c diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c index 82f409a..b879185 100644 --- a/lunaix-os/kernel/fs/vfs.c +++ b/lunaix-os/kernel/fs/vfs.c @@ -9,6 +9,40 @@ * */ +// Welcome to The Mountain O'Shit! :) + +/* + TODO vfs & device todos checklist + + It is overseen by Twilight Sparkle ;) + + 1. Get inodes hooked into lru (CHECKED) + 2. Get dnodes hooked into lru (CHECKED) + 3. Get inodes properly hashed so they can be reused by underling fs (CHECKED) + 4. (lru) Add a callback function (or destructor) for eviction. (CHECKED) + [good idea] or a constructor/destructor pattern in cake allocator ? + 5. (mount) Figure out a way to identify a busy mount point before unmount + 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. (CHECKED) + 6. (mount) Ability to track all mount points (including sub-mounts) + 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? (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 + above the regular file when we mount it on. + 10. (device) device number (dev_t) allocation + [good idea] :: composition +*/ + #include #include #include @@ -20,17 +54,23 @@ #include #include +#include + #define PATH_DELIM '/' -#define DNODE_HASHTABLE_BITS 10 -#define DNODE_HASHTABLE_SIZE (1 << DNODE_HASHTABLE_BITS) -#define DNODE_HASH_MASK (DNODE_HASHTABLE_SIZE - 1) -#define DNODE_HASHBITS (32 - DNODE_HASHTABLE_BITS) -#define lock_inode(inode) mutex_lock(&inode->lock) #define unlock_inode(inode) mutex_unlock(&inode->lock) +#define lock_inode(inode) \ + ({ \ + mutex_lock(&inode->lock); \ + lru_use_one(inode_lru, &inode->lru); \ + }) -#define lock_dnode(dnode) mutex_lock(&dnode->lock) #define unlock_dnode(dnode) mutex_unlock(&dnode->lock) +#define lock_dnode(dnode) \ + ({ \ + mutex_lock(&dnode->lock); \ + lru_use_one(dnode_lru, &dnode->lru); \ + }) static struct cake_pile* dnode_pile; static struct cake_pile* inode_pile; @@ -38,27 +78,27 @@ static struct cake_pile* file_pile; static struct cake_pile* superblock_pile; static struct cake_pile* fd_pile; -static struct v_superblock* root_sb; +struct v_dnode* vfs_sysroot; static struct hbucket* dnode_cache; -static int fs_id = 0; +static struct lru_zone *dnode_lru, *inode_lru; struct hstr vfs_ddot = HSTR("..", 2); struct hstr vfs_dot = HSTR(".", 1); struct hstr vfs_empty = HSTR("", 0); -struct v_dnode* -vfs_d_alloc(); - -void -vfs_d_free(struct v_dnode* dnode); - struct v_superblock* vfs_sb_alloc(); void vfs_sb_free(struct v_superblock* sb); +static int +__vfs_try_evict_dnode(struct lru_node* obj); + +static int +__vfs_try_evict_inode(struct lru_node* obj); + void vfs_init() { @@ -70,25 +110,29 @@ vfs_init() superblock_pile = cake_new_pile("sb_cache", sizeof(struct v_superblock), 1, 0); - dnode_cache = vzalloc(DNODE_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); 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(); - root_sb->root->inode = vfs_i_alloc(); + // 创建一个根dnode。 + vfs_sysroot = vfs_d_alloc(NULL, &vfs_empty); + atomic_fetch_add(&vfs_sysroot->ref_count, 1); } inline struct hbucket* -__dcache_get_bucket(struct v_dnode* parent, unsigned int hash) +__dcache_hash(struct v_dnode* parent, uint32_t* hash) { + uint32_t _hash = *hash; // 与parent的指针值做加法,来减小碰撞的可能性。 - hash += (uint32_t)parent; + _hash += (uint32_t)parent; // 确保低位更加随机 - hash = hash ^ (hash >> DNODE_HASHBITS); - return &dnode_cache[hash & DNODE_HASH_MASK]; + _hash = _hash ^ (_hash >> VFS_HASHBITS); + *hash = _hash; + return &dnode_cache[_hash & VFS_HASH_MASK]; } struct v_dnode* @@ -101,12 +145,13 @@ vfs_dcache_lookup(struct v_dnode* parent, struct hstr* str) return parent->parent ? parent->parent : parent; } - struct hbucket* slot = __dcache_get_bucket(parent, str->hash); + uint32_t hash = str->hash; + struct hbucket* slot = __dcache_hash(parent, &hash); struct v_dnode *pos, *n; hashtable_bucket_foreach(slot, pos, n, hash_list) { - if (pos->name.hash == str->hash) { + if (pos->name.hash == hash) { return pos; } } @@ -116,10 +161,34 @@ vfs_dcache_lookup(struct v_dnode* parent, struct hstr* str) void vfs_dcache_add(struct v_dnode* parent, struct v_dnode* dnode) { - struct hbucket* bucket = __dcache_get_bucket(parent, dnode->name.hash); + 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); } +void +vfs_dcache_remove(struct v_dnode* dnode) +{ + assert(dnode->ref_count == 1); + + llist_delete(&dnode->siblings); + hlist_delete(&dnode->hash_list); + + dnode->parent = NULL; + atomic_fetch_sub(&dnode->ref_count, 1); +} + +void +vfs_dcache_rehash(struct v_dnode* new_parent, struct v_dnode* dnode) +{ + hstr_rehash(&dnode->name, HSTR_FULL_HASH); + vfs_dcache_remove(dnode); + vfs_dcache_add(new_parent, dnode); +} + int __vfs_walk(struct v_dnode* start, const char* path, @@ -134,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++; } @@ -146,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) { @@ -185,37 +257,34 @@ __vfs_walk(struct v_dnode* start, dnode = vfs_dcache_lookup(current_level, &name); if (!dnode) { - dnode = vfs_d_alloc(); - dnode->name = HHSTR(valloc(VFS_NAME_MAXLEN), j, name.hash); + dnode = vfs_d_alloc(current_level, &name); - strcpy(dnode->name.value, name_content); + if (!dnode) { + errno = ENOMEM; + goto error; + } - lock_inode(current_level->inode); + struct v_inode* current_inode = current_level->inode; - errno = - current_level->inode->ops.dir_lookup(current_level->inode, dnode); + lock_inode(current_inode); + + 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 error; + goto cleanup; } - - vfs_dcache_add(current_level, dnode); - - dnode->parent = current_level; - llist_append(¤t_level->children, &dnode->siblings); } unlock_dnode(current_level); @@ -229,9 +298,9 @@ __vfs_walk(struct v_dnode* start, *dentry = current_level; return 0; -error: - vfree(dnode->name.value); +cleanup: vfs_d_free(dnode); +error: *dentry = NULL; return errno; } @@ -250,15 +319,20 @@ vfs_walk(struct v_dnode* start, int errno = __vfs_walk(start, path, &interim, component, options); int counter = 0; - while (!errno) { + // 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) && - !(options & VFS_WALK_NOFOLLOW) && - interim->inode->ops.read_symlink) { - errno = interim->inode->ops.read_symlink(interim->inode, &pathname); + interim->inode->ops->read_symlink) { + + lock_inode(interim->inode); + errno = + interim->inode->ops->read_symlink(interim->inode, &pathname); + unlock_inode(interim->inode); + if (errno) { break; } @@ -274,78 +348,17 @@ vfs_walk(struct v_dnode* start, return errno; } -int -vfs_mount(const char* target, const char* fs_name, bdev_t 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, bdev_t device, struct v_dnode* mnt_point) -{ - 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_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) -{ - int errno = 0; - struct v_superblock* sb = mnt_point->super_block; - if (!sb) { - return EINVAL; - } - if (!(errno = sb->fs->unmount(sb))) { - struct v_dnode* fs_root = sb->root; - llist_delete(&fs_root->siblings); - llist_delete(&sb->sb_list); - vfs_sb_free(sb); - } - 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)); @@ -361,19 +374,32 @@ 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; } +void +vfs_assign_inode(struct v_dnode* assign_to, struct v_inode* inode) +{ + if (assign_to->inode) { + assign_to->inode->link_count--; + } + assign_to->inode = inode; + inode->link_count++; +} + int vfs_link(struct v_dnode* to_link, struct v_dnode* name) { @@ -382,11 +408,10 @@ 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))) { - name->inode = to_link->inode; - atomic_fetch_add(&to_link->inode->link_count, 1); + } else if (!(errno = to_link->inode->ops->link(to_link->inode, name))) { + vfs_assign_inode(name, to_link->inode); } unlock_inode(to_link->inode); @@ -397,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); @@ -414,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); @@ -441,51 +468,158 @@ 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); } +static int +__vfs_try_evict_dnode(struct lru_node* obj) +{ + struct v_dnode* dnode = container_of(obj, struct v_dnode, lru); + + if (!dnode->ref_count) { + vfs_d_free(dnode); + return 1; + } + return 0; +} + +static int +__vfs_try_evict_inode(struct lru_node* obj) +{ + struct v_inode* inode = container_of(obj, struct v_inode, lru); + + if (!inode->link_count && !inode->open_count) { + vfs_i_free(inode); + return 1; + } + return 0; +} + 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) { + lru_evict_half(dnode_lru); + + if (!(dnode = cake_grab(dnode_pile))) { + return NULL; + } + } + memset(dnode, 0, sizeof(*dnode)); llist_init_head(&dnode->children); + llist_init_head(&dnode->siblings); mutex_init(&dnode->lock); 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); - dnode->name = vfs_empty; return dnode; } void vfs_d_free(struct v_dnode* dnode) { - if (dnode->ops.destruct) { - dnode->ops.destruct(dnode); + 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 + struct v_dnode *pos, *n; + llist_for_each(pos, n, &dnode->children, siblings) + { + vfs_dcache_remove(pos); } + + vfree(dnode->name.value); cake_release(dnode_pile, dnode); } struct v_inode* -vfs_i_alloc() +vfs_i_find(struct v_superblock* sb, uint32_t i_id) +{ + 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 == i_id) { + lru_use_one(inode_lru, &pos->lru); + return pos; + } + } + + 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) { - struct v_inode* inode = cake_grab(inode_pile); + assert(sb->ops.init_inode); + + struct v_inode* inode; + if (!(inode = cake_grab(inode_pile))) { + lru_evict_half(inode_lru); + if (!(inode = cake_grab(inode_pile))) { + return NULL; + } + } + memset(inode, 0, sizeof(*inode)); mutex_init(&inode->lock); + sb->ops.init_inode(sb, inode); + + inode->sb = sb; + inode->ctime = clock_unixtime(); + inode->atime = inode->ctime; + inode->mtime = inode->ctime; + +done: + 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); } @@ -493,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) { @@ -527,20 +656,23 @@ __vfs_try_locate_file(const char* path, } struct v_dnode* parent = *fdir; - struct v_dnode* file_new = vfs_d_alloc(); - file_new->name = HHSTR(valloc(VFS_NAME_MAXLEN), name.len, name.hash); - strcpy(file_new->name.value, name_str); + struct v_dnode* file_new = vfs_d_alloc(parent, &name); - if (!(errno = parent->inode->ops.create(parent->inode, file_new))) { - *file = file_new; + if (!file_new) { + return ENOMEM; + } + lock_dnode(parent); + + 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 { - vfree(file_new->name.value); vfs_d_free(file_new); } + unlock_dnode(parent); + return errno; } @@ -559,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)); @@ -629,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 = @@ -637,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) @@ -676,16 +803,22 @@ __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); }) - - unlock_inode(file->inode); + __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; + unlock_inode(file->inode); return errno; } + unlock_inode(file->inode); + done: return DO_STATUS(errno); } @@ -708,16 +841,22 @@ __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); }) - - unlock_inode(file->inode); + __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; + unlock_inode(file->inode); return errno; } + unlock_inode(file->inode); + done: return DO_STATUS(errno); } @@ -746,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; } @@ -789,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); @@ -885,15 +1024,12 @@ __DEFINE_LXSYSCALL1(int, rmdir, const char*, pathname) lock_dnode(dnode); - if (dnode->parent) - lock_dnode(dnode->parent); - if ((dnode->super_block->fs->types & FSTYPE_ROFS)) { errno = EROFS; goto done; } - if (dnode->ref_count || dnode->inode->open_count) { + if (dnode->ref_count > 1 || dnode->inode->open_count) { errno = EBUSY; goto done; } @@ -903,57 +1039,71 @@ __DEFINE_LXSYSCALL1(int, rmdir, const char*, pathname) goto done; } - lock_inode(dnode->inode); + struct v_dnode* parent = dnode->parent; + + if (!parent) { + errno = EINVAL; + goto done; + } + + lock_dnode(parent); + lock_inode(parent->inode); if ((dnode->inode->itype & VFS_IFDIR)) { - errno = dnode->inode->ops.rmdir(dnode->inode); - // FIXME remove the dnode from cache & parent. + errno = parent->inode->ops->rmdir(parent->inode, dnode); + if (!errno) { + vfs_dcache_remove(dnode); + } } else { errno = ENOTDIR; } - unlock_inode(dnode->inode); + unlock_inode(parent->inode); + unlock_dnode(parent); done: unlock_dnode(dnode); - if (dnode->parent) - unlock_dnode(dnode->parent); return DO_STATUS(errno); } __DEFINE_LXSYSCALL1(int, mkdir, const char*, path) { + int errno = 0; struct v_dnode *parent, *dir; - struct hstr component = HSTR(valloc(VFS_NAME_MAXLEN), 0); - int errno = - vfs_walk(__current->cwd, path, &parent, &component, VFS_WALK_PARENT); - if (errno) { + 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, &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 { - dir = vfs_d_alloc(); - dir->name = component; - if (!(errno = parent->inode->ops.mkdir(parent->inode, dir))) { - llist_append(&parent->children, &dir->siblings); - } else { - vfs_d_free(dir); - vfree(component.value); - } + } else if (!(errno = parent->inode->ops->mkdir(parent->inode, dir))) { + vfs_dcache_add(parent, dir); + goto cleanup; } + vfs_d_free(dir); + +cleanup: unlock_inode(parent->inode); unlock_dnode(parent); - done: return DO_STATUS(errno); } @@ -963,7 +1113,7 @@ __vfs_do_unlink(struct v_dnode* dnode) { struct v_inode* inode = dnode->inode; - if (dnode->ref_count) { + if (dnode->ref_count > 1) { return EBUSY; } @@ -975,10 +1125,9 @@ __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) { - inode->link_count--; - // FIXME remove the dnode from cache & parent + vfs_d_free(dnode); } } else { errno = EISDIR; @@ -1139,14 +1288,14 @@ __DEFINE_LXSYSCALL2(int, errno = EROFS; goto done; } - if (!dnode->inode->ops.symlink) { + if (!dnode->inode->ops->set_symlink) { errno = ENOTSUP; goto done; } lock_inode(dnode->inode); - errno = dnode->inode->ops.symlink(dnode->inode, link_target); + errno = dnode->inode->ops->set_symlink(dnode->inode, link_target); unlock_inode(dnode->inode); @@ -1167,10 +1316,12 @@ __vfs_do_chdir(struct v_dnode* dnode) } if (__current->cwd) { - __current->cwd->ref_count--; + atomic_fetch_sub(&__current->cwd->ref_count, 1); + mnt_chillax(__current->cwd->mnt); } - dnode->ref_count--; + atomic_fetch_add(&dnode->ref_count, 1); + mnt_mkbusy(dnode->mnt); __current->cwd = dnode; unlock_dnode(dnode); @@ -1240,4 +1391,96 @@ done: return ret_ptr; } -// TODO rename syscall \ No newline at end of file +int +vfs_do_rename(struct v_dnode* current, struct v_dnode* target) +{ + if (current->inode->id == target->inode->id) { + // hard link + return 0; + } + + if (current->ref_count > 1 || target->ref_count > 1) { + return EBUSY; + } + + if (current->super_block != target->super_block) { + return EXDEV; + } + + int errno = 0; + + struct v_dnode* oldparent = current->parent; + struct v_dnode* newparent = target->parent; + + lock_dnode(current); + lock_dnode(target); + if (oldparent) + lock_dnode(oldparent); + if (newparent) + lock_dnode(newparent); + + if (!llist_empty(&target->children)) { + errno = ENOTEMPTY; + unlock_dnode(target); + goto cleanup; + } + + if ((errno = + current->inode->ops->rename(current->inode, current, target))) { + unlock_dnode(target); + goto cleanup; + } + + // re-position current + hstrcpy(¤t->name, &target->name); + vfs_dcache_rehash(newparent, current); + + // detach target + vfs_d_free(target); + + unlock_dnode(target); + +cleanup: + unlock_dnode(current); + if (oldparent) + unlock_dnode(oldparent); + if (newparent) + unlock_dnode(newparent); + + return errno; +} + +__DEFINE_LXSYSCALL2(int, rename, const char*, oldpath, const char*, newpath) +{ + struct v_dnode *cur, *target_parent, *target; + struct hstr name = HSTR(valloc(VFS_NAME_MAXLEN), 0); + int errno = 0; + + if ((errno = vfs_walk(__current->cwd, oldpath, &cur, NULL, 0))) { + goto done; + } + + if ((errno = vfs_walk( + __current->cwd, newpath, &target_parent, &name, VFS_WALK_PARENT))) { + goto done; + } + + errno = vfs_walk(target_parent, name.value, &target, NULL, 0); + if (errno == ENOENT) { + target = vfs_d_alloc(target_parent, &name); + vfs_dcache_add(target_parent, target); + } else if (errno) { + goto done; + } + + if (!target) { + errno = ENOMEM; + goto done; + } + + errno = vfs_do_rename(cur, target); + +done: + vfree(name.value); + return DO_STATUS(errno); +} \ No newline at end of file