Changeset 7a96476 in mainline

Timestamp:

2011-03-27T13:35:15Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ef76d72

Parents:

a04b62d

Message:

Add some comments

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (3 diffs)
• mfs_ops.c (modified) (9 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -71 +71 @@
         unsigned long zbmap_blocks;
         unsigned long firstdatazone;
-        unsigned long itable_size;
         int log2_zone_size;
-        int ino_per_block;
-        int dirsize;
         int block_size;
-        mfs_version_t fs_version;
         uint32_t max_file_size;
         uint16_t magic;
         uint16_t state;
+
+        /*The following fields do not exist on disk but only in memory*/
+        unsigned long itable_size;
+        mfs_version_t fs_version;
+        int ino_per_block;
+        int dirsize;
         bool long_names;
         bool native;
@@ -99 +101 @@
         uint32_t        i_izone[V2_NR_INDIRECT_ZONES];
 
+        /*The following fields do not exist on disk but only in memory*/
         bool dirty;
         fs_index_t index;
@@ -108 +111 @@
         char d_name[MFS3_MAX_NAME_LEN];
 
+        /*The following fields do not exist on disk but only in memory*/
         bool dirty;
 };

uspace/srv/fs/minixfs/mfs_ops.c

@@ -151 +151 @@
 
         if (check_magic_number(sb->s_magic, &native, &version, &longnames)) {
+                /*This is a V1 or V2 Minix filesystem*/
                 magic = sb->s_magic;
                 goto recognized;
@@ -161 +162 @@
                 return;
         }
+
+        /*This is a V3 Minix filesystem*/
 
         magic = sb3->s_magic;
@@ -250 +253 @@
 void mfs_stat(ipc_callid_t rid, ipc_call_t *request)
 {
-        mfsdebug("mfs_stat called\n");
+        mfsdebug("mfs_stat()\n");
         libfs_stat(&mfs_libfs_ops, mfs_reg.fs_handle, rid, request);
 }
@@ -260 +263 @@
         struct mfs_instance *instance;
 
-        mfsdebug("node_get called\n");
+        mfsdebug("mfs_node_get()\n");
 
         rc = mfs_instance_get(devmap_handle, &instance);
@@ -354 +357 @@
 
         if (!ino_i)
-                return -1;
+                goto out_err;
 
         ino_i->index = index;
@@ -431 +434 @@
                 d_info = read_directory_entry(mnode, i++);
 
-                if (!d_info)
+                if (!d_info) {
+                        /*Reached the end of the dentries list*/
                         goto out;
+                }
 
                 if (d_info->d_inum) {
+                        /*A valid entry has been found*/
                         *has_children = true;
                         free(d_info);
@@ -446 +452 @@
 
         if (n_dentries > 2 && !*has_children)
-                printf(NAME ": Filesystem corruption detected");
+                printf(NAME ": Filesystem corruption detected\n");
 
         if (*has_children)
@@ -485 +491 @@
                                 mfs_version_t *version, bool *longfilenames)
 {
+        bool rc = false;
         *longfilenames = false;
 
@@ -490 +497 @@
                 *native = magic == MFS_MAGIC_V1;
                 *version = MFS_VERSION_V1;
-                return true;
+                rc = true;
         } else if (magic == MFS_MAGIC_V1L || magic == MFS_MAGIC_V1LR) {
                 *native = magic == MFS_MAGIC_V1L;
                 *version = MFS_VERSION_V1;
                 *longfilenames = true;
-                return true;
+                rc = true;
         } else if (magic == MFS_MAGIC_V2 || magic == MFS_MAGIC_V2R) {
                 *native = magic == MFS_MAGIC_V2;
                 *version = MFS_VERSION_V2;
-                return true;
+                rc = true;
         } else if (magic == MFS_MAGIC_V2L || magic == MFS_MAGIC_V2LR) {
                 *native = magic == MFS_MAGIC_V2L;
                 *version = MFS_VERSION_V2;
                 *longfilenames = true;
-                return true;
+                rc = true;
         } else if (magic == MFS_MAGIC_V3 || magic == MFS_MAGIC_V3R) {
                 *native = magic == MFS_MAGIC_V3;
                 *version = MFS_VERSION_V3;
-                return true;
-        }
-
-        return false;
+                rc = true;
+        }
+
+        return rc;
 }