Changes in uspace/srv/fs/mfs/mfs_ops.c [1ba6651:5930e3f] in mainline

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (17 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 long mfs_size_block(service_id_t service_id);
 
 static hash_table_t open_nodes;
@@ -84 +85 @@
         .destroy = mfs_destroy_node,
         .has_children = mfs_has_children,
-        .lnkcnt_get = mfs_lnkcnt_get
+        .lnkcnt_get = mfs_lnkcnt_get,
+        .size_block = mfs_size_block
 };
 
 /* Hash table interface for open nodes hash table */
+
 typedef struct {
         service_id_t service_id;
@@ -189 +192 @@
                 /* 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;
@@ -345 +347 @@
         uint32_t inum;
 
+        mfsdebug("%s()\n", __FUNCTION__);
+
         r = mfs_instance_get(service_id, &inst);
         if (r != EOK)
@@ -377 +381 @@
                 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;
@@ -419 +421 @@
         free(ino_i);
 out_err:
-        mfs_free_inode(inst, inum);
         return r;
 }
@@ -430 +431 @@
         struct mfs_dentry_info d_info;
         int r;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         if (!S_ISDIR(ino_i->i_mode))
@@ -477 +480 @@
         struct mfs_instance *instance;
 
+        mfsdebug("%s()\n", __FUNCTION__);
+
         rc = mfs_instance_get(service_id, &instance);
         if (rc != EOK)
@@ -489 +494 @@
         int rc = EOK;
         struct mfs_node *mnode = fsnode->data;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         fibril_mutex_lock(&open_nodes_lock);
@@ -549 +556 @@
         int rc;
 
+        mfsdebug("%s()\n", __FUNCTION__);
+
         fibril_mutex_lock(&open_nodes_lock);
 
@@ -561 +570 @@
         if (already_open) {
                 mnode = hash_table_get_inst(already_open, struct mfs_node, link);
-
                 *rfn = mnode->fsnode;
                 mnode->refcnt++;
@@ -642 +650 @@
         struct mfs_sb_info *sbi = parent->instance->sbi;
         bool destroy_dentry = false;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         if (str_size(name) > sbi->max_name_len)
@@ -665 +675 @@
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
                 if (r != EOK) {
-                        mfs_remove_dentry(child, ".");
                         destroy_dentry = true;
                         goto exit;
@@ -693 +702 @@
         bool has_children;
         int r;
+
+        mfsdebug("%s()\n", __FUNCTION__);
 
         if (!parent)
@@ -915 +926 @@
                 
                 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;
@@ -958 +967 @@
 mfs_destroy(service_id_t service_id, fs_index_t index)
 {
-        fs_node_t *fn = NULL;
+        fs_node_t *fn;
         int r;
 
@@ -1129 +1138 @@
 }
 
+static long
+mfs_size_block(service_id_t service_id)
+{
+        long block_size;
+
+        struct mfs_instance *inst;
+        int rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+        if (NULL == inst)
+                return ENOENT;
+        block_size = inst->sbi->block_size;
+        return block_size;
+}
+
 vfs_out_ops_t mfs_ops = {
         .mounted = mfs_mounted,