diff options
Diffstat (limited to 'kernel/fs')
-rw-r--r-- | kernel/fs/namev.c | 16 | ||||
-rw-r--r-- | kernel/fs/open.c | 2 | ||||
-rw-r--r-- | kernel/fs/s5fs/s5fs.c | 21 | ||||
-rw-r--r-- | kernel/fs/s5fs/s5fs_subr.c | 13 | ||||
-rw-r--r-- | kernel/fs/vfs_syscall.c | 30 | ||||
-rw-r--r-- | kernel/fs/vnode_specials.c | 10 |
6 files changed, 1 insertions, 91 deletions
diff --git a/kernel/fs/namev.c b/kernel/fs/namev.c index f443b2e..2465d74 100644 --- a/kernel/fs/namev.c +++ b/kernel/fs/namev.c @@ -76,17 +76,6 @@ long namev_is_descendant(vnode_t *a, vnode_t *b) long namev_lookup(vnode_t *dir, const char *name, size_t namelen, vnode_t **res_vnode) { - // NOT_YET_IMPLEMENTED("VFS: namev_lookup"); - - // KASSERT(NULL != dir); - // KASSERT(NULL != name); - // KASSERT(NULL != res_vnode); - - // if (namelen == 0) - // { - // return -EINVAL; - // } - if ( dir->vn_ops == NULL || dir->vn_ops->lookup == NULL @@ -206,8 +195,6 @@ static const char *namev_tokenize(const char **search, size_t *len) long namev_dir(vnode_t *base, const char *path, vnode_t **res_vnode, const char **name, size_t *namelen) { - // NOT_YET_IMPLEMENTED("VFS: namev_dir"); - // Check if the pathname is nullish if (path == NULL || *path == '\0') { @@ -316,9 +303,6 @@ long namev_dir(vnode_t *base, const char *path, vnode_t **res_vnode, long namev_open(vnode_t *base, const char *path, int oflags, int mode, devid_t devid, struct vnode **res_vnode) { - // NOT_YET_IMPLEMENTED("VFS: namev_open"); - - // KASSERT(NULL != base); KASSERT(NULL != path); KASSERT(NULL != res_vnode); diff --git a/kernel/fs/open.c b/kernel/fs/open.c index e8945de..cf55934 100644 --- a/kernel/fs/open.c +++ b/kernel/fs/open.c @@ -62,8 +62,6 @@ long get_empty_fd(int *fd) */ long do_open(const char *filename, int oflags) { - // NOT_YET_IMPLEMENTED("VFS: do_open"); - // Check if oflags is valid if ((oflags & O_WRONLY) && (oflags & O_RDWR)) { diff --git a/kernel/fs/s5fs/s5fs.c b/kernel/fs/s5fs/s5fs.c index fc327bb..9205ecf 100644 --- a/kernel/fs/s5fs/s5fs.c +++ b/kernel/fs/s5fs/s5fs.c @@ -210,8 +210,6 @@ long s5fs_mount(fs_t *fs) */ static void s5fs_read_vnode(fs_t *fs, vnode_t *vn) { - // NOT_YET_IMPLEMENTED("S5FS: s5fs_read_vnode"); - // Get the s5_node from the vnode s5_node_t *s5_node = VNODE_TO_S5NODE(vn); @@ -284,8 +282,6 @@ static void s5fs_read_vnode(fs_t *fs, vnode_t *vn) */ static void s5fs_delete_vnode(fs_t *fs, vnode_t *vn) { - // NOT_YET_IMPLEMENTED("S5FS: s5fs_delete_vnode"); - // Get the s5_node from the vnode s5_node_t *s5_node = VNODE_TO_S5NODE(vn); @@ -381,7 +377,6 @@ static void s5fs_sync(fs_t *fs) static ssize_t s5fs_read(vnode_t *vnode, size_t pos, void *buf, size_t len) { KASSERT(!S_ISDIR(vnode->vn_mode) && "should be handled at the VFS level"); - // NOT_YET_IMPLEMENTED("S5FS: s5fs_read"); return s5_read_file(VNODE_TO_S5NODE(vnode), pos, buf, len); } @@ -390,7 +385,6 @@ static ssize_t s5fs_write(vnode_t *vnode, size_t pos, const void *buf, size_t len) { KASSERT(!S_ISDIR(vnode->vn_mode) && "should be handled at the VFS level"); - // NOT_YET_IMPLEMENTED("S5FS: s5fs_write"); return s5_write_file(VNODE_TO_S5NODE(vnode), pos, buf, len); } @@ -400,8 +394,6 @@ static ssize_t s5fs_write(vnode_t *vnode, size_t pos, const void *buf, */ static long s5fs_mmap(vnode_t *file, mobj_t **ret) { - // NOT_YET_IMPLEMENTED("VM: s5fs_mmap"); - // Add a reference to the underlying mobj and return it mobj_lock(&file->vn_mobj); mobj_ref(&file->vn_mobj); @@ -436,7 +428,6 @@ static long s5fs_mknod(struct vnode *dir, const char *name, size_t namelen, int mode, devid_t devid, struct vnode **out) { KASSERT(S_ISDIR(dir->vn_mode) && "should be handled at the VFS level"); - // NOT_YET_IMPLEMENTED("S5FS: s5fs_mknod"); // Check if the mode is not supported if (!(S_ISCHR(mode) || S_ISBLK(mode) || S_ISREG(mode))) @@ -515,8 +506,6 @@ static long s5fs_mknod(struct vnode *dir, const char *name, size_t namelen, long s5fs_lookup(vnode_t *dir, const char *name, size_t namelen, vnode_t **ret) { - // NOT_YET_IMPLEMENTED("S5FS: s5fs_lookup"); - // Find the directory entry size_t filepos; long ino = s5_find_dirent(VNODE_TO_S5NODE(dir), name, namelen, &filepos); @@ -583,7 +572,6 @@ static long s5fs_unlink(vnode_t *dir, const char *name, size_t namelen) KASSERT(S_ISDIR(dir->vn_mode) && "should be handled at the VFS level"); KASSERT(!name_match(".", name, namelen)); KASSERT(!name_match("..", name, namelen)); - // NOT_YET_IMPLEMENTED("S5FS: s5fs_unlink"); // Find the directory entry s5_node_t *s5_node = VNODE_TO_S5NODE(dir); @@ -656,8 +644,6 @@ static long s5fs_rename(vnode_t *olddir, const char *oldname, size_t oldnamelen, vnode_t *newdir, const char *newname, size_t newnamelen) { - // NOT_YET_IMPLEMENTED("S5FS: s5fs_rename"); - // Check if the new name is too long if (newnamelen >= NAME_LEN) { @@ -779,8 +765,7 @@ static long s5fs_mkdir(vnode_t *dir, const char *name, size_t namelen, struct vnode **out) { KASSERT(S_ISDIR((dir)->vn_mode) && "should be handled at the VFS level"); - // NOT_YET_IMPLEMENTED("S5FS: s5fs_mkdir"); - + // Allocate a new inode, get its properties first s5fs_t *s5fs = VNODE_TO_S5FS(dir); uint16_t type = S5_TYPE_DIR; @@ -863,7 +848,6 @@ static long s5fs_rmdir(vnode_t *parent, const char *name, size_t namelen) KASSERT(!name_match(".", name, namelen)); KASSERT(!name_match("..", name, namelen)); KASSERT(S_ISDIR(parent->vn_mode) && "should be handled at the VFS level"); - // NOT_YET_IMPLEMENTED("S5FS: s5fs_rmdir"); // Find the directory entry s5_node_t *s5_node = VNODE_TO_S5NODE(parent); @@ -926,7 +910,6 @@ static long s5fs_rmdir(vnode_t *parent, const char *name, size_t namelen) static long s5fs_readdir(vnode_t *vnode, size_t pos, struct dirent *d) { KASSERT(S_ISDIR(vnode->vn_mode) && "should be handled at the VFS level"); - // NOT_YET_IMPLEMENTED("S5FS: s5fs_readdir"); // Read the directory entry s5_dirent_t s5_dirent; @@ -965,8 +948,6 @@ static long s5fs_readdir(vnode_t *vnode, size_t pos, struct dirent *d) */ static long s5fs_stat(vnode_t *vnode, stat_t *ss) { - // NOT_YET_IMPLEMENTED("S5FS: s5fs_stat"); - // Get the inode s5_inode_t *s5_inode = &VNODE_TO_S5NODE(vnode)->inode; diff --git a/kernel/fs/s5fs/s5fs_subr.c b/kernel/fs/s5fs/s5fs_subr.c index 731e424..c8872c0 100644 --- a/kernel/fs/s5fs/s5fs_subr.c +++ b/kernel/fs/s5fs/s5fs_subr.c @@ -127,7 +127,6 @@ static inline void s5_release_file_block(pframe_t **pfp) long s5_file_block_to_disk_block(s5_node_t *sn, size_t file_blocknum, int alloc, int *newp) { - // NOT_YET_IMPLEMENTED("S5FS: s5_file_block_to_disk_block"); if (file_blocknum >= S5_MAX_FILE_BLOCKS) { return -EINVAL; @@ -241,8 +240,6 @@ pframe_t *s5_cache_and_clear_block(mobj_t *mo, long block, long loc) { */ ssize_t s5_read_file(s5_node_t *sn, size_t pos, char *buf, size_t len) { - // NOT_YET_IMPLEMENTED("S5FS: s5_read_file"); - KASSERT(sn->vnode.vn_len == sn->inode.s5_un.s5_size); // Check if pos is greater than or equal to the length of the file @@ -327,8 +324,6 @@ ssize_t s5_read_file(s5_node_t *sn, size_t pos, char *buf, size_t len) */ ssize_t s5_write_file(s5_node_t *sn, size_t pos, const char *buf, size_t len) { - // NOT_YET_IMPLEMENTED("S5FS: s5_write_file"); - // Check if pos was beyond S5_MAX_FILE_SIZE if (pos >= S5_MAX_FILE_SIZE) { @@ -422,8 +417,6 @@ ssize_t s5_write_file(s5_node_t *sn, size_t pos, const char *buf, size_t len) */ static long s5_alloc_block(s5fs_t *s5fs) { - // NOT_YET_IMPLEMENTED("S5FS: s5_alloc_block"); - // Protect access to the super block s5_lock_super(s5fs); @@ -669,7 +662,6 @@ long s5_find_dirent(s5_node_t *sn, const char *name, size_t namelen, { KASSERT(S_ISDIR(sn->vnode.vn_mode) && "should be handled at the VFS level"); KASSERT(S5_BLOCK_SIZE == PAGE_SIZE && "be wary, thee"); - // NOT_YET_IMPLEMENTED("S5FS: s5_find_dirent"); if (namelen == 0) { @@ -732,7 +724,6 @@ void s5_remove_dirent(s5_node_t *sn, const char *name, size_t namelen, { vnode_t *dir = &sn->vnode; s5_inode_t *inode = &sn->inode; - // NOT_YET_IMPLEMENTED("S5FS: s5_remove_dirent"); // Assert that the directory exists KASSERT(S_ISDIR(dir->vn_mode)); @@ -815,8 +806,6 @@ long s5_link(s5_node_t *dir, const char *name, size_t namelen, { KASSERT(kmutex_owns_mutex(&dir->vnode.vn_mobj.mo_mutex)); - // NOT_YET_IMPLEMENTED("S5FS: s5_link"); - // Find the position of the directory entry size_t filepos; long inode_num = s5_find_dirent(dir, name, namelen, &filepos); @@ -866,8 +855,6 @@ long s5_link(s5_node_t *dir, const char *name, size_t namelen, */ long s5_inode_blocks(s5_node_t *sn) { - // NOT_YET_IMPLEMENTED("S5FS: s5_inode_blocks"); - // Initialize the number of file blocks long num_file_blocks = 0; diff --git a/kernel/fs/vfs_syscall.c b/kernel/fs/vfs_syscall.c index fc0878e..548eaa9 100644 --- a/kernel/fs/vfs_syscall.c +++ b/kernel/fs/vfs_syscall.c @@ -26,8 +26,6 @@ */ ssize_t do_read(int fd, void *buf, size_t len) { - // NOT_YET_IMPLEMENTED("VFS: do_read"); - // Check if the file descriptor is valid if (fd < 0 || fd >= NFILES) { @@ -96,8 +94,6 @@ ssize_t do_read(int fd, void *buf, size_t len) */ ssize_t do_write(int fd, const void *buf, size_t len) { - // NOT_YET_IMPLEMENTED("VFS: do_write"); - // Check if the file descriptor is valid if (fd < 0 || fd >= NFILES) { @@ -165,8 +161,6 @@ ssize_t do_write(int fd, const void *buf, size_t len) */ long do_close(int fd) { - // NOT_YET_IMPLEMENTED("VFS: do_close"); - // Check if the file descriptor is valid if (fd < 0 || fd >= NFILES) { @@ -198,8 +192,6 @@ long do_close(int fd) */ long do_dup(int fd) { - // NOT_YET_IMPLEMENTED("VFS: do_dup"); - // Check if the file descriptor is valid if (fd < 0 || fd >= NFILES) { @@ -239,8 +231,6 @@ long do_dup(int fd) */ long do_dup2(int ofd, int nfd) { - // NOT_YET_IMPLEMENTED("VFS: do_dup2"); - // Check if the file descriptors are valid if (ofd < 0 || ofd >= NFILES || nfd < 0 || nfd >= NFILES) { @@ -294,8 +284,6 @@ long do_dup2(int ofd, int nfd) */ long do_mknod(const char *path, int mode, devid_t devid) { - // NOT_YET_IMPLEMENTED("VFS: do_mknod"); - // Check if the mode is valid if (mode != S_IFCHR && mode != S_IFBLK && mode != S_IFREG) { @@ -337,8 +325,6 @@ long do_mknod(const char *path, int mode, devid_t devid) */ long do_mkdir(const char *path) { - // NOT_YET_IMPLEMENTED("VFS: do_mkdir"); - // Call namev_dir() to find the parent of the directory to be created size_t len = 0; const char *name = NULL; @@ -404,8 +390,6 @@ long do_mkdir(const char *path) */ long do_rmdir(const char *path) { - // NOT_YET_IMPLEMENTED("VFS: do_rmdir"); - // Call namev_dir() to find the parent of the directory to be removed size_t len = 0; const char *name = NULL; @@ -489,8 +473,6 @@ long do_rmdir(const char *path) */ long do_unlink(const char *path) { - // NOT_YET_IMPLEMENTED("VFS: do_unlink"); - // Call namev_dir() to find the parent of the file to be unlinked size_t len = 0; const char *name = NULL; @@ -566,8 +548,6 @@ long do_unlink(const char *path) */ long do_link(const char *oldpath, const char *newpath) { - // NOT_YET_IMPLEMENTED("VFS: do_link"); - // Resolve the oldpath if (strlen(newpath) > NAME_LEN) { @@ -657,8 +637,6 @@ long do_link(const char *oldpath, const char *newpath) */ long do_rename(const char *oldpath, const char *newpath) { - // NOT_YET_IMPLEMENTED("VFS: do_rename"); - // Get the old directory size_t old_len = 0; const char *old_name = NULL; @@ -724,8 +702,6 @@ long do_rename(const char *oldpath, const char *newpath) */ long do_chdir(const char *path) { - // NOT_YET_IMPLEMENTED("VFS: do_chdir"); - // Resolve the path vnode_t *vnode = NULL; long ret = namev_resolve(NULL, path, &vnode); @@ -763,8 +739,6 @@ long do_chdir(const char *path) */ ssize_t do_getdent(int fd, struct dirent *dirp) { - // NOT_YET_IMPLEMENTED("VFS: do_getdent"); - // Check if the file descriptor is valid if (fd < 0 || fd >= NFILES) { @@ -817,8 +791,6 @@ ssize_t do_getdent(int fd, struct dirent *dirp) */ off_t do_lseek(int fd, off_t offset, int whence) { - // NOT_YET_IMPLEMENTED("VFS: do_lseek"); - // Check if the file descriptor is valid if (fd < 0 || fd >= NFILES) { @@ -871,8 +843,6 @@ off_t do_lseek(int fd, off_t offset, int whence) */ long do_stat(const char *path, stat_t *buf) { - // NOT_YET_IMPLEMENTED("VFS: do_stat"); - // Resolve the path vnode_t *vnode = NULL; long ret = namev_resolve(NULL, path, &vnode); diff --git a/kernel/fs/vnode_specials.c b/kernel/fs/vnode_specials.c index 41d4ce2..876c62a 100644 --- a/kernel/fs/vnode_specials.c +++ b/kernel/fs/vnode_specials.c @@ -110,8 +110,6 @@ static long special_file_stat(vnode_t *file, stat_t *ss) static ssize_t chardev_file_read(vnode_t *file, size_t pos, void *buf, size_t count) { - // NOT_YET_IMPLEMENTED("VFS: chardev_file_read"); - // check if the vnode represetns a chardev if (file->vn_dev.chardev == NULL) { @@ -137,8 +135,6 @@ static ssize_t chardev_file_read(vnode_t *file, size_t pos, void *buf, static long chardev_file_write(vnode_t *file, size_t pos, const void *buf, size_t count) { - // NOT_YET_IMPLEMENTED("VFS: chardev_file_write"); - // check if the vnode represents a chardev if (file->vn_dev.chardev == NULL) { @@ -159,8 +155,6 @@ static long chardev_file_write(vnode_t *file, size_t pos, const void *buf, */ static long chardev_file_mmap(vnode_t *file, mobj_t **ret) { - // NOT_YET_IMPLEMENTED("VM: chardev_file_mmap"); - // check if the vnode represents a chardev chardev_t *dev = file->vn_dev.chardev; if (dev == NULL) @@ -174,8 +168,6 @@ static long chardev_file_mmap(vnode_t *file, mobj_t **ret) static long chardev_file_fill_pframe(vnode_t *file, pframe_t *pf) { - // NOT_YET_IMPLEMENTED("VM: chardev_file_fill_pframe"); - // check if the vnode represents a chardev chardev_t *dev = file->vn_dev.chardev; if (dev == NULL) @@ -189,8 +181,6 @@ static long chardev_file_fill_pframe(vnode_t *file, pframe_t *pf) static long chardev_file_flush_pframe(vnode_t *file, pframe_t *pf) { - // NOT_YET_IMPLEMENTED("VM: chardev_file_flush_pframe"); - // check if the vnode represents a chardev chardev_t *dev = file->vn_dev.chardev; if (dev == NULL) |