Changes in uspace/lib/ext4/src/ops.c [5e801dc:922427a8] in mainline

File:

• uspace/lib/ext4/src/ops.c (modified) (11 diffs)

uspace/lib/ext4/src/ops.c

@@ -64 +64 @@
 static bool ext4_is_dots(const uint8_t *, size_t);
 static errno_t ext4_instance_get(service_id_t, ext4_instance_t **);
+static errno_t handle_sparse_or_unallocated_fblock(ext4_filesystem_t *,
+    ext4_inode_ref_t *, uint32_t, uint32_t, uint32_t *, int *, bool *);
 
 /* Forward declarations of ext4 libfs operations. */
@@ -113 +115 @@
 }
 
-static bool open_nodes_key_equal(const void *key_arg, const ht_link_t *item)
+static bool open_nodes_key_equal(const void *key_arg, size_t hash, const ht_link_t *item)
 {
         const node_key_t *key = key_arg;
@@ -122 +124 @@
 }
 
-static hash_table_ops_t open_nodes_ops = {
+static const hash_table_ops_t open_nodes_ops = {
         .hash = open_nodes_hash,
         .key_hash = open_nodes_key_hash,
@@ -158 +160 @@
 }
 
-/*
- * Ext4 libfs operations.
- */
-
 /** Get instance from internal table by service_id.
  *
@@ -170 +168 @@
  *
  */
-errno_t ext4_instance_get(service_id_t service_id, ext4_instance_t **inst)
+static errno_t ext4_instance_get(service_id_t service_id, ext4_instance_t **inst)
 {
         fibril_mutex_lock(&instance_list_mutex);
@@ -190 +188 @@
         return EINVAL;
 }
+
+/*
+ * Ext4 libfs operations.
+ */
 
 /** Get root node of filesystem specified by service_id.
@@ -810 +812 @@
 }
 
-/** Extract device identifier from node.
+/** Get service ID for a service-special file.
  *
  * @param node Node to extract id from
  *
- * @return id of device, where is the filesystem
+ * @return Service ID for a service-special file, zero for a regular file.
  *
  */
 service_id_t ext4_service_get(fs_node_t *fn)
 {
-        ext4_node_t *enode = EXT4_NODE(fn);
-        return enode->instance->service_id;
+        return 0;
 }
 
@@ -1285 +1286 @@
     size_t *wbytes, aoff64_t *nsize)
 {
-        fs_node_t *fn;
+        fs_node_t *fn = NULL;
         errno_t rc2;
+        bool fblock_allocated = false;
+        ext4_inode_ref_t *inode_ref = NULL;
+
         errno_t rc = ext4_node_get(&fn, service_id, index);
         if (rc != EOK)
@@ -1315 +1319 @@
 
         /* Load inode */
-        ext4_inode_ref_t *inode_ref = enode->inode_ref;
+        inode_ref = enode->inode_ref;
         rc = ext4_filesystem_get_inode_data_block_index(inode_ref, iblock,
             &fblock);
@@ -1323 +1327 @@
         }
 
-        /* Check for sparse file */
+        /* Handle sparse or unallocated block */
         if (fblock == 0) {
-                if ((ext4_superblock_has_feature_incompatible(fs->superblock,
-                    EXT4_FEATURE_INCOMPAT_EXTENTS)) &&
-                    (ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS))) {
-                        uint32_t last_iblock =
-                            ext4_inode_get_size(fs->superblock, inode_ref->inode) /
-                            block_size;
-
-                        while (last_iblock < iblock) {
-                                rc = ext4_extent_append_block(inode_ref, &last_iblock,
-                                    &fblock, true);
-                                if (rc != EOK) {
-                                        async_answer_0(&call, rc);
-                                        goto exit;
-                                }
-                        }
-
-                        rc = ext4_extent_append_block(inode_ref, &last_iblock,
-                            &fblock, false);
-                        if (rc != EOK) {
-                                async_answer_0(&call, rc);
-                                goto exit;
-                        }
-                } else {
-                        rc = ext4_balloc_alloc_block(inode_ref, &fblock);
-                        if (rc != EOK) {
-                                async_answer_0(&call, rc);
-                                goto exit;
-                        }
-
-                        rc = ext4_filesystem_set_inode_data_block_index(inode_ref,
-                            iblock, fblock);
-                        if (rc != EOK) {
-                                ext4_balloc_free_block(inode_ref, fblock);
-                                async_answer_0(&call, rc);
-                                goto exit;
-                        }
+                rc = handle_sparse_or_unallocated_fblock(fs, inode_ref,
+                    block_size, iblock, &fblock, &flags, &fblock_allocated);
+                if (rc != EOK) {
+                        async_answer_0(&call, rc);
+                        goto exit;
                 }
-
-                flags = BLOCK_FLAGS_NOREAD;
-                inode_ref->dirty = true;
         }
 
@@ -1403 +1373 @@
 
 exit:
+        if (rc != EOK && fblock_allocated)
+                ext4_balloc_free_block(inode_ref, fblock);
+
         rc2 = ext4_node_put(fn);
         return rc == EOK ? rc2 : rc;
+}
+
+/** Handle sparse or unallocated block.
+ *
+ * @param fs            Filesystem handle
+ * @param inode_ref     I-node reference
+ * @param block_size    Filesystem block size
+ * @param iblock        Logical block
+ * @param fblock        Place to store allocated block address
+ * @param flags         BLOCK_FLAGS to update
+ * @param allocated     Place to store whether new block was allocated
+ *
+ * @return Error code
+ *
+ */
+static errno_t handle_sparse_or_unallocated_fblock(ext4_filesystem_t *fs,
+    ext4_inode_ref_t *inode_ref, uint32_t block_size, uint32_t iblock,
+    uint32_t *fblock, int *flags, bool *allocated)
+{
+        errno_t rc;
+
+        /* Check for sparse file */
+        if ((ext4_superblock_has_feature_incompatible(fs->superblock,
+            EXT4_FEATURE_INCOMPAT_EXTENTS)) &&
+            (ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS))) {
+                uint32_t last_iblock =
+                    ext4_inode_get_size(fs->superblock, inode_ref->inode) /
+                    block_size;
+
+                while (last_iblock < iblock) {
+                        rc = ext4_extent_append_block(inode_ref, &last_iblock,
+                            fblock, true);
+                        if (rc != EOK)
+                                return rc;
+                }
+
+                rc = ext4_extent_append_block(inode_ref, &last_iblock, fblock,
+                    false);
+                if (rc != EOK)
+                        return rc;
+
+                *allocated = false;
+        } else { /* Allocate new block */
+                rc = ext4_balloc_alloc_block(inode_ref, fblock);
+                if (rc != EOK)
+                        return rc;
+
+                rc = ext4_filesystem_set_inode_data_block_index(inode_ref,
+                    iblock, *fblock);
+                if (rc != EOK) {
+                        ext4_balloc_free_block(inode_ref, *fblock);
+                        return rc;
+                }
+
+                *allocated = true;
+        }
+
+        *flags = BLOCK_FLAGS_NOREAD;
+        inode_ref->dirty = true;
+
+        return EOK;
 }