FINAfinal submission (for real this time)HEADmaster

2 files changed, 1 insertions, 33 deletions

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;