Changeset e03d545 in mainline

Timestamp:

2011-09-05T19:41:25Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

5987f917, 9dbf5587

Parents:

5222e746

Message:

Minor fixes to minixfs:

• Do not check the value of nlinks in the mfs_destroy() function
• Rename the mfs_put_inode() function to mfs_put_inode_core()
• Read the entire superblock when mounting the fs image

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (1 diff)
• mfs_inode.c (modified) (1 diff)
• mfs_ops.c (modified) (5 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -159 +159 @@
 
 extern int
-mfs_put_inode(struct mfs_node *mnode);
+mfs_put_inode_core(struct mfs_node *mnode);
 
 extern int

uspace/srv/fs/minixfs/mfs_inode.c

@@ -186 +186 @@
 
 int
-mfs_put_inode(struct mfs_node *mnode)
+mfs_put_inode_core(struct mfs_node *mnode)
 {
         int rc = EOK;

uspace/srv/fs/minixfs/mfs_ops.c

@@ -191 +191 @@
 
         /* Read the superblock */
-        rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 1, sb);
+        rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 2, sb);
         if (rc != EOK) {
                 free(instance);
@@ -513 +513 @@
                 assert(mnode->instance->open_nodes_cnt > 0);
                 mnode->instance->open_nodes_cnt--;
-                rc = mfs_put_inode(mnode);
+                rc = mfs_put_inode_core(mnode);
                 free(mnode->ino_i);
                 free(mnode);
@@ -961 +961 @@
 
         /*Destroy the inode*/
-        r = mfs_destroy_node(fn);
-        return r;
+        return mfs_destroy_node(fn);
 }
 
@@ -979 +978 @@
 
         assert(!has_children);
-
-        if (mnode->ino_i->i_nlinks > 0) {
-                mfsdebug("nlinks = %d", mnode->ino_i->i_nlinks);
-                r = EOK;
-                goto out;
-        }
 
         /*Free the entire inode content*/
@@ -990 +983 @@
         if (r != EOK)
                 goto out;
+
+        /*Mark the inode as free in the bitmap*/
         r = mfs_free_inode(mnode->instance, mnode->ino_i->index);