Changeset 3a5ee6c in mainline for uspace/srv/fs/minixfs/mfs_ops.c

Timestamp:

2011-09-04T14:08:37Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bbd4c72

Parents:

c699b0c

Message:

rename functions to avoid conflicts

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (16 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -183 +183 @@
         sb = malloc(MFS_SUPERBLOCK_SIZE);
         if (!sb) {
+                free(instance);
+                free(sbi);
                 block_fini(service_id);
                 return ENOMEM;
@@ -190 +192 @@
         rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 1, sb);
         if (rc != EOK) {
+                free(instance);
+                free(sbi);
+                free(sb);
                 block_fini(service_id);
                 return rc;
@@ -204 +209 @@
         if (!check_magic_number(sb3->s_magic, &native, &version, &longnames)) {
                 mfsdebug("magic number not recognized\n");
+                free(instance);
+                free(sbi);
+                free(sb);
                 block_fini(service_id);
                 return ENOTSUP;
@@ -262 +270 @@
         rc = block_cache_init(service_id, sbi->block_size, 0, cmode);
         if (rc != EOK) {
+                free(instance);
                 free(sbi);
-                free(instance);
+                free(sb);
                 block_cache_fini(service_id);
                 block_fini(service_id);
@@ -433 +442 @@
         unsigned i;
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
-                r = read_dentry(mnode, &d_info, i);
+                r = mfs_read_dentry(mnode, &d_info, i);
                 if (r != EOK)
                         return r;
@@ -504 +513 @@
                 assert(mnode->instance->open_nodes_cnt > 0);
                 mnode->instance->open_nodes_cnt--;
-                rc = put_inode(mnode);
+                rc = mfs_put_inode(mnode);
                 free(mnode->ino_i);
                 free(mnode);
@@ -586 +595 @@
         struct mfs_ino_info *ino_i;
 
-        rc = get_inode(inst, &ino_i, index);
+        rc = mfs_get_inode(inst, &ino_i, index);
         if (rc != EOK)
                 goto out_err;
@@ -645 +654 @@
                 return ENAMETOOLONG;
 
-        int r = insert_dentry(parent, name, child->ino_i->index);
+        int r = mfs_insert_dentry(parent, name, child->ino_i->index);
         if (r != EOK)
                 goto exit_error;
 
         if (S_ISDIR(child->ino_i->i_mode)) {
-                r = insert_dentry(child, ".", child->ino_i->index);
+                r = mfs_insert_dentry(child, ".", child->ino_i->index);
                 if (r != EOK)
                         goto exit_error;
                 //child->ino_i->i_nlinks++;
                 //child->ino_i->dirty = true;
-                r = insert_dentry(child, "..", parent->ino_i->index);
+                r = mfs_insert_dentry(child, "..", parent->ino_i->index);
                 if (r != EOK)
                         goto exit_error;
@@ -686 +695 @@
                 return ENOTEMPTY;
 
-        r = remove_dentry(parent, name);
+        r = mfs_remove_dentry(parent, name);
         if (r != EOK)
                 return r;
@@ -722 +731 @@
         unsigned i;
         for (i = 2; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
-                r = read_dentry(mnode, &d_info, i);
+                r = mfs_read_dentry(mnode, &d_info, i);
                 if (r != EOK)
                         return r;
@@ -774 +783 @@
 
                 for (; pos < mnode->ino_i->i_size / sbi->dirsize; ++pos) {
-                        rc = read_dentry(mnode, &d_info, pos);
+                        rc = mfs_read_dentry(mnode, &d_info, pos);
                         if (rc != EOK)
                                 goto out_error;
@@ -807 +816 @@
                 block_t *b;
 
-                rc = read_map(&zone, mnode, pos);
+                rc = mfs_read_map(&zone, mnode, pos);
                 if (rc != EOK)
                         goto out_error;
@@ -883 +892 @@
 
         if (pos < boundary) {
-                r = read_map(&block, mnode, pos);
+                r = mfs_read_map(&block, mnode, pos);
                 if (r != EOK)
                         goto out_err;
@@ -901 +910 @@
                         goto out_err;
 
-                r = write_map(mnode, pos, block, &dummy);
+                r = mfs_write_map(mnode, pos, block, &dummy);
                 if (r != EOK)
                         goto out_err;
@@ -972 +981 @@
 
         /*Free the entire inode content*/
-        r = inode_shrink(mnode, mnode->ino_i->i_size);
+        r = mfs_inode_shrink(mnode, mnode->ino_i->i_size);
         if (r != EOK)
                 goto out;
@@ -1000 +1009 @@
                 r = EOK;
         else
-                r = inode_shrink(mnode, ino_i->i_size - size);
+                r = mfs_inode_shrink(mnode, ino_i->i_size - size);
 
         mfs_node_put(fn);