Changes in uspace/srv/fs/mfs/mfs_ops.c [7a46bfe:40a2af3] in mainline

File:

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

uspace/srv/fs/mfs/mfs_ops.c

@@ -55 +55 @@
 static int mfs_has_children(bool *has_children, fs_node_t *fsnode);
 static int mfs_root_get(fs_node_t **rfn, service_id_t service_id);
-static service_id_t mfs_device_get(fs_node_t *fsnode);
+static service_id_t mfs_service_get(fs_node_t *fsnode);
 static aoff64_t mfs_size_get(fs_node_t *node);
 static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);
@@ -81 +81 @@
         .size_get = mfs_size_get,
         .root_get = mfs_root_get,
-        .device_get = mfs_device_get,
+        .service_get = mfs_service_get,
         .is_directory = mfs_is_directory,
         .is_file = mfs_is_file,
@@ -325 +325 @@
 }
 
-service_id_t mfs_device_get(fs_node_t *fsnode)
+service_id_t mfs_service_get(fs_node_t *fsnode)
 {
         struct mfs_node *node = fsnode->data;
@@ -468 +468 @@
 static aoff64_t mfs_size_get(fs_node_t *node)
 {
-        assert(node);
-
         const struct mfs_node *mnode = node->data;
-        assert(mnode);
-        assert(mnode->ino_i);
-
         return mnode->ino_i->i_size;
 }
@@ -513 +508 @@
                 assert(mnode->instance->open_nodes_cnt > 0);
                 mnode->instance->open_nodes_cnt--;
-                rc = mfs_put_inode_core(mnode);
+                rc = mfs_put_inode(mnode);
                 free(mnode->ino_i);
                 free(mnode);
@@ -535 +530 @@
 {
         struct mfs_node *mnode = fsnode->data;
-
-        assert(mnode->ino_i);
         return mnode->ino_i->index;
 }