Changes in uspace/srv/fs/mfs/mfs_ops.c [1eaa3cf:5b56dc7] in mainline

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (19 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -64 +64 @@
 static int mfs_check_sanity(struct mfs_sb_info *sbi);
 static bool is_power_of_two(uint32_t n);
-static int mfs_size_block(service_id_t service_id, uint32_t *size);
-static int mfs_total_block_count(service_id_t service_id, uint64_t *count);
-static int mfs_free_block_count(service_id_t service_id, uint64_t *count);
 
 static hash_table_t open_nodes;
@@ -87 +84 @@
         .destroy = mfs_destroy_node,
         .has_children = mfs_has_children,
-        .lnkcnt_get = mfs_lnkcnt_get,
-        .size_block = mfs_size_block,
-        .total_block_count = mfs_total_block_count,
-        .free_block_count = mfs_free_block_count
+        .lnkcnt_get = mfs_lnkcnt_get
 };
 
 /* Hash table interface for open nodes hash table */
+
 typedef struct {
         service_id_t service_id;
@@ -195 +190 @@
                 /* This is a V1 or V2 Minix filesystem */
                 magic = sb->s_magic;
-        } else if (check_magic_number(sb3->s_magic, &native,
-            &version, &longnames)) {
+        } else if (check_magic_number(sb3->s_magic, &native, &version, &longnames)) {
                 /* This is a V3 Minix filesystem */
                 magic = sb3->s_magic;
@@ -216 +210 @@
         sbi->isearch = 0;
         sbi->zsearch = 0;
-        sbi->nfree_zones_valid = false;
-        sbi->nfree_zones = 0;
 
         if (version == MFS_VERSION_V3) {
@@ -353 +345 @@
         uint32_t inum;
 
+        mfsdebug("%s()\n", __FUNCTION__);
+
         r = mfs_instance_get(service_id, &inst);
         if (r != EOK)
@@ -385 +379 @@
                 ino_i->i_mode = S_IFDIR;
                 ino_i->i_nlinks = 1; /* This accounts for the '.' dentry */
-        } else {
+        } else
                 ino_i->i_mode = S_IFREG;
-                ino_i->i_nlinks = 0;
-        }
 
         ino_i->i_uid = 0;
@@ -427 +419 @@
         free(ino_i);
 out_err:
-        mfs_free_inode(inst, inum);
         return r;
 }
@@ -438 +429 @@
         struct mfs_dentry_info d_info;
         int r;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         if (!S_ISDIR(ino_i->i_mode))
@@ -459 +452 @@
 
                 if (comp_size == dentry_name_size &&
-                    memcmp(component, d_info.d_name, dentry_name_size) == 0) {
+                    !bcmp(component, d_info.d_name, dentry_name_size)) {
                         /* Hit! */
                         mfs_node_core_get(rfn, mnode->instance,
@@ -485 +478 @@
         struct mfs_instance *instance;
 
+        mfsdebug("%s()\n", __FUNCTION__);
+
         rc = mfs_instance_get(service_id, &instance);
         if (rc != EOK)
@@ -497 +492 @@
         int rc = EOK;
         struct mfs_node *mnode = fsnode->data;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         fibril_mutex_lock(&open_nodes_lock);
@@ -557 +554 @@
         int rc;
 
+        mfsdebug("%s()\n", __FUNCTION__);
+
         fibril_mutex_lock(&open_nodes_lock);
 
@@ -569 +568 @@
         if (already_open) {
                 mnode = hash_table_get_inst(already_open, struct mfs_node, link);
-
                 *rfn = mnode->fsnode;
                 mnode->refcnt++;
@@ -650 +648 @@
         struct mfs_sb_info *sbi = parent->instance->sbi;
         bool destroy_dentry = false;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         if (str_size(name) > sbi->max_name_len)
@@ -673 +673 @@
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
                 if (r != EOK) {
-                        mfs_remove_dentry(child, ".");
                         destroy_dentry = true;
                         goto exit;
@@ -701 +700 @@
         bool has_children;
         int r;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         if (!parent)
@@ -923 +924 @@
                 
                 r = mfs_write_map(mnode, pos, block, &dummy);
-                if (r != EOK) {
-                        mfs_free_zone(mnode->instance, block);
+                if (r != EOK)
                         goto out_err;
-                }
 
                 flags = BLOCK_FLAGS_NOREAD;
@@ -966 +965 @@
 mfs_destroy(service_id_t service_id, fs_index_t index)
 {
-        fs_node_t *fn = NULL;
+        fs_node_t *fn;
         int r;
 
@@ -1137 +1136 @@
 }
 
-static int
-mfs_size_block(service_id_t service_id, uint32_t *size)
-{
-        struct mfs_instance *inst;
-        int rc;
-
-        rc = mfs_instance_get(service_id, &inst);
-        if (rc != EOK)
-                return rc;
-
-        if (NULL == inst)
-                return ENOENT;
-        
-        *size = inst->sbi->block_size;
-
-        return EOK;
-}
-
-static int
-mfs_total_block_count(service_id_t service_id, uint64_t *count)
-{
-        struct mfs_instance *inst;
-        int rc;
-        
-        rc = mfs_instance_get(service_id, &inst);
-        if (rc != EOK)
-                return rc;
-
-        if (NULL == inst)
-                return ENOENT;
-        
-        *count = (uint64_t) MFS_BMAP_SIZE_BITS(inst->sbi, BMAP_ZONE);
-
-        return EOK;
-}
-
-static int
-mfs_free_block_count(service_id_t service_id, uint64_t *count)
-{
-        uint32_t block_free;
-        
-        struct mfs_instance *inst;
-        int rc = mfs_instance_get(service_id, &inst);
-        if (rc != EOK)
-                return rc;
-
-        struct mfs_sb_info *sbi = inst->sbi;
-
-        if (!sbi->nfree_zones_valid) {
-                /* The cached number of free zones is not valid,
-                 * we need to scan the bitmap to retrieve the
-                 * current value.
-                 */
-
-                rc = mfs_count_free_zones(inst, &block_free);
-                if (rc != EOK)
-                        return rc;
-
-                sbi->nfree_zones = block_free;
-                sbi->nfree_zones_valid = true;
-        }
-
-        *count = sbi->nfree_zones;
-
-        return EOK;
-}
-
 vfs_out_ops_t mfs_ops = {
         .mounted = mfs_mounted,